reSWIGed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
index 9ed02a465803713318637a86de9ce86e7b45ebcc..a19ffa4097ad825366357269e3afcb0f9b99fc81 100644 (file)
--- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxEditableListBox swig_types[0] 
@@ -250,47 +252,64 @@ static swig_type_info *swig_types[33];
 
 #define SWIG_name    "_gizmos"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -317,81 +336,120 @@ static swig_type_info *swig_types[33];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 PyObject *wxEditableListBox_GetStrings(wxEditableListBox *self){
@@ -434,60 +492,97 @@ public:
 };
 
 
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
+{
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
+}
+
+
 SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIG_As_bool(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}
 
+
+// See my_fragments.i
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
+    }
+    else if (val)
+        *val = (unsigned long)v;
     return 1;
-  }
 }
 
 
 SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+SWIG_As_unsigned_SS_long(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;
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
-  }
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
  // C++ version of Python aware control
@@ -528,52 +623,81 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl)
 
 
 #if UINT_MAX < LONG_MAX
-#define SWIG_FromUnsignedInt    SWIG_FromLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_long
+/*@@*/
 #else
-#define SWIG_FromUnsignedInt    SWIG_FromUnsignedLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long
+/*@@*/
 #endif
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
-                             unsigned long max_value) 
+SWIGSTATICINLINE(int)
+  SWIG_CheckUnsignedLongInRange(unsigned long value,
+                               unsigned long max_value,
+                               const char *errmsg) 
 {
-  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);
+  if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' minimum %ld",
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
-}
+  return 1;
+ }
 
 
 #if UINT_MAX != ULONG_MAX
-SWIGSTATICINLINE(unsigned int)
-SWIG_AsUnsignedInt(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 { 
-  return swig_numeric_cast(unsigned int,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned int", UINT_MAX));
+  const char* errmsg = val ? "unsigned int" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned int);
+      return 1;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong
+SWIGSTATICINLINE(unsigned int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedInt(PyObject* obj)
+SWIGSTATICINLINE(unsigned int)
+SWIG_As_unsigned_SS_int(PyObject* obj)
 {
-  SWIG_AsUnsignedInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned int v;
+  if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_int(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0);
 }
 
 wxString wxPyTreeListCtrl_GetItemText(wxPyTreeListCtrl *self,wxTreeItemId const &item,int column){
@@ -657,21 +781,20 @@ PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItemId cons
             return tup;
         }
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -683,6 +806,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
+
 PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly){
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
@@ -699,7 +823,7 @@ PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId c
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_DynamicSashNameStr_set(PyObject *_val) {
+static int _wrap_DynamicSashNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DynamicSashNameStr is read-only.");
     return 1;
 }
@@ -719,7 +843,7 @@ static PyObject *_wrap_DynamicSashNameStr_get() {
 }
 
 
-static int _wrap_EditableListBoxNameStr_set(PyObject *_val) {
+static int _wrap_EditableListBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable EditableListBoxNameStr is read-only.");
     return 1;
 }
@@ -739,7 +863,7 @@ static PyObject *_wrap_EditableListBoxNameStr_get() {
 }
 
 
-static int _wrap_TreeListCtrlNameStr_set(PyObject *_val) {
+static int _wrap_TreeListCtrlNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TreeListCtrlNameStr is read-only.");
     return 1;
 }
@@ -759,7 +883,7 @@ static PyObject *_wrap_TreeListCtrlNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_DynamicSashSplitEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DynamicSashSplitEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
     wxDynamicSashSplitEvent *result;
@@ -785,14 +909,14 @@ static PyObject *_wrap_new_DynamicSashSplitEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * DynamicSashSplitEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DynamicSashSplitEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDynamicSashSplitEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DynamicSashUnifyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DynamicSashUnifyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
     wxDynamicSashUnifyEvent *result;
@@ -818,14 +942,14 @@ static PyObject *_wrap_new_DynamicSashUnifyEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * DynamicSashUnifyEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DynamicSashUnifyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDynamicSashUnifyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DynamicSashWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -854,7 +978,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -870,7 +994,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -903,7 +1027,7 @@ static PyObject *_wrap_new_DynamicSashWindow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_PreDynamicSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreDynamicSashWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDynamicSashWindow *result;
     char *kwnames[] = {
@@ -926,7 +1050,7 @@ static PyObject *_wrap_new_PreDynamicSashWindow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DynamicSashWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -959,7 +1083,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -975,7 +1099,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args,
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1009,7 +1133,7 @@ static PyObject *_wrap_DynamicSashWindow_Create(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DynamicSashWindow_GetHScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DynamicSashWindow_GetHScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1039,7 +1163,7 @@ static PyObject *_wrap_DynamicSashWindow_GetHScrollBar(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_DynamicSashWindow_GetVScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DynamicSashWindow_GetVScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDynamicSashWindow *arg1 = (wxDynamicSashWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1069,14 +1193,14 @@ static PyObject *_wrap_DynamicSashWindow_GetVScrollBar(PyObject *self, PyObject
 }
 
 
-static PyObject * DynamicSashWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DynamicSashWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDynamicSashWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EditableListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1109,7 +1233,7 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1132,7 +1256,7 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1173,7 +1297,7 @@ static PyObject *_wrap_new_EditableListBox(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_SetStrings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxArrayString *arg2 = 0 ;
@@ -1228,7 +1352,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_EditableListBox_GetStrings(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetStrings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     PyObject *result;
@@ -1254,7 +1378,7 @@ static PyObject *_wrap_EditableListBox_GetStrings(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxPyListCtrl *result;
@@ -1280,7 +1404,7 @@ static PyObject *_wrap_EditableListBox_GetListCtrl(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_EditableListBox_GetDelButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetDelButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxBitmapButton *result;
@@ -1308,7 +1432,7 @@ static PyObject *_wrap_EditableListBox_GetDelButton(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_EditableListBox_GetNewButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetNewButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxBitmapButton *result;
@@ -1336,7 +1460,7 @@ static PyObject *_wrap_EditableListBox_GetNewButton(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_EditableListBox_GetUpButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetUpButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxBitmapButton *result;
@@ -1364,7 +1488,7 @@ static PyObject *_wrap_EditableListBox_GetUpButton(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_EditableListBox_GetDownButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetDownButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxBitmapButton *result;
@@ -1392,7 +1516,7 @@ static PyObject *_wrap_EditableListBox_GetDownButton(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_EditableListBox_GetEditButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EditableListBox_GetEditButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
     wxBitmapButton *result;
@@ -1420,14 +1544,14 @@ static PyObject *_wrap_EditableListBox_GetEditButton(PyObject *self, PyObject *a
 }
 
 
-static PyObject * EditableListBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * EditableListBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEditableListBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -1451,7 +1575,7 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_RemotelyScrolledTreeCtrl",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         {
@@ -1466,7 +1590,7 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1484,7 +1608,7 @@ static PyObject *_wrap_new_RemotelyScrolledTreeCtrl(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_RemotelyScrolledTreeCtrl_HideVScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RemotelyScrolledTreeCtrl_HideVScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRemotelyScrolledTreeCtrl *arg1 = (wxRemotelyScrolledTreeCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1509,7 +1633,7 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_HideVScrollbar(PyObject *self, P
 }
 
 
-static PyObject *_wrap_RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRemotelyScrolledTreeCtrl *arg1 = (wxRemotelyScrolledTreeCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1534,7 +1658,7 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars(PyObject
 }
 
 
-static PyObject *_wrap_RemotelyScrolledTreeCtrl_GetScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RemotelyScrolledTreeCtrl_GetScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRemotelyScrolledTreeCtrl *arg1 = (wxRemotelyScrolledTreeCtrl *) 0 ;
     wxScrolledWindow *result;
@@ -1562,7 +1686,7 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_GetScrolledWindow(PyObject *self
 }
 
 
-static PyObject *_wrap_RemotelyScrolledTreeCtrl_ScrollToLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RemotelyScrolledTreeCtrl_ScrollToLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRemotelyScrolledTreeCtrl *arg1 = (wxRemotelyScrolledTreeCtrl *) 0 ;
     int arg2 ;
@@ -1577,9 +1701,9 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_ScrollToLine(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RemotelyScrolledTreeCtrl_ScrollToLine",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRemotelyScrolledTreeCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1595,7 +1719,7 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_ScrollToLine(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_RemotelyScrolledTreeCtrl_SetCompanionWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RemotelyScrolledTreeCtrl_SetCompanionWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRemotelyScrolledTreeCtrl *arg1 = (wxRemotelyScrolledTreeCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1624,7 +1748,7 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_SetCompanionWindow(PyObject *sel
 }
 
 
-static PyObject *_wrap_RemotelyScrolledTreeCtrl_GetCompanionWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RemotelyScrolledTreeCtrl_GetCompanionWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRemotelyScrolledTreeCtrl *arg1 = (wxRemotelyScrolledTreeCtrl *) 0 ;
     wxWindow *result;
@@ -1652,14 +1776,14 @@ static PyObject *_wrap_RemotelyScrolledTreeCtrl_GetCompanionWindow(PyObject *sel
 }
 
 
-static PyObject * RemotelyScrolledTreeCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * RemotelyScrolledTreeCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRemotelyScrolledTreeCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeCompanionWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1684,7 +1808,7 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1700,7 +1824,7 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1718,7 +1842,7 @@ static PyObject *_wrap_new_TreeCompanionWindow(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCompanionWindow__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCompanionWindow__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCompanionWindow *arg1 = (wxPyTreeCompanionWindow *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -1749,7 +1873,7 @@ static PyObject *_wrap_TreeCompanionWindow__setCallbackInfo(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_TreeCompanionWindow_GetTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCompanionWindow_GetTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCompanionWindow *arg1 = (wxPyTreeCompanionWindow *) 0 ;
     wxRemotelyScrolledTreeCtrl *result;
@@ -1775,7 +1899,7 @@ static PyObject *_wrap_TreeCompanionWindow_GetTreeCtrl(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeCompanionWindow_SetTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCompanionWindow_SetTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCompanionWindow *arg1 = (wxPyTreeCompanionWindow *) 0 ;
     wxRemotelyScrolledTreeCtrl *arg2 = (wxRemotelyScrolledTreeCtrl *) 0 ;
@@ -1804,14 +1928,14 @@ static PyObject *_wrap_TreeCompanionWindow_SetTreeCtrl(PyObject *self, PyObject
 }
 
 
-static PyObject * TreeCompanionWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeCompanionWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTreeCompanionWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ThinSplitterWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1836,7 +1960,7 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1852,7 +1976,7 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1870,14 +1994,14 @@ static PyObject *_wrap_new_ThinSplitterWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * ThinSplitterWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ThinSplitterWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxThinSplitterWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1902,7 +2026,7 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1918,7 +2042,7 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1936,14 +2060,14 @@ static PyObject *_wrap_new_SplitterScrolledWindow(PyObject *self, PyObject *args
 }
 
 
-static PyObject * SplitterScrolledWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SplitterScrolledWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSplitterScrolledWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LEDNumberCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1968,7 +2092,7 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1984,7 +2108,7 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2002,7 +2126,7 @@ static PyObject *_wrap_new_LEDNumberCtrl(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_new_PreLEDNumberCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreLEDNumberCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *result;
     char *kwnames[] = {
@@ -2025,7 +2149,7 @@ static PyObject *_wrap_new_PreLEDNumberCtrl(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -2054,7 +2178,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -2070,7 +2194,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2089,7 +2213,7 @@ static PyObject *_wrap_LEDNumberCtrl_Create(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_GetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     int result;
@@ -2108,14 +2232,14 @@ static PyObject *_wrap_LEDNumberCtrl_GetAlignment(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_GetDrawFaded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_GetDrawFaded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     bool result;
@@ -2143,7 +2267,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetDrawFaded(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     wxString *result;
@@ -2178,7 +2302,7 @@ static PyObject *_wrap_LEDNumberCtrl_GetValue(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_SetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     int arg2 ;
@@ -2193,10 +2317,10 @@ static PyObject *_wrap_LEDNumberCtrl_SetAlignment(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:LEDNumberCtrl_SetAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLEDNumberCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxLEDValueAlign) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2213,7 +2337,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetAlignment(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_SetDrawFaded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_SetDrawFaded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     bool arg2 ;
@@ -2228,10 +2352,10 @@ static PyObject *_wrap_LEDNumberCtrl_SetDrawFaded(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:LEDNumberCtrl_SetDrawFaded",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLEDNumberCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2248,7 +2372,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetDrawFaded(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLEDNumberCtrl *arg1 = (wxLEDNumberCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -2270,7 +2394,7 @@ static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, Py
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2295,14 +2419,14 @@ static PyObject *_wrap_LEDNumberCtrl_SetValue(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * LEDNumberCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LEDNumberCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLEDNumberCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeListColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -2330,19 +2454,19 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py
         }
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (wxTreeListColumnAlign) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2367,7 +2491,7 @@ static PyObject *_wrap_new_TreeListColumnInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     bool result;
@@ -2395,7 +2519,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetShown(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     int result;
@@ -2414,14 +2538,14 @@ static PyObject *_wrap_TreeListColumnInfo_GetAlignment(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     wxString result;
@@ -2453,7 +2577,7 @@ static PyObject *_wrap_TreeListColumnInfo_GetText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_GetImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_GetImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     int result;
@@ -2472,14 +2596,14 @@ static PyObject *_wrap_TreeListColumnInfo_GetImage(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_GetSelectedImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_GetSelectedImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     int result;
@@ -2498,14 +2622,14 @@ static PyObject *_wrap_TreeListColumnInfo_GetSelectedImage(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     size_t result;
@@ -2524,14 +2648,14 @@ static PyObject *_wrap_TreeListColumnInfo_GetWidth(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     bool arg2 ;
@@ -2544,7 +2668,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetShown",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2560,7 +2684,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetShown(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     int arg2 ;
@@ -2573,7 +2697,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetAlignment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxTreeListColumnAlign) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2589,7 +2713,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetAlignment(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     wxString *arg2 = 0 ;
@@ -2630,7 +2754,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_SetImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_SetImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     int arg2 ;
@@ -2643,7 +2767,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetImage(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetImage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2659,7 +2783,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetImage(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_SetSelectedImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_SetSelectedImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     int arg2 ;
@@ -2672,7 +2796,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetSelectedImage(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetSelectedImage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2688,7 +2812,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetSelectedImage(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_TreeListColumnInfo_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListColumnInfo_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeListColumnInfo *arg1 = (wxTreeListColumnInfo *) 0 ;
     size_t arg2 ;
@@ -2701,7 +2825,7 @@ static PyObject *_wrap_TreeListColumnInfo_SetWidth(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListColumnInfo_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2717,14 +2841,14 @@ static PyObject *_wrap_TreeListColumnInfo_SetWidth(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * TreeListColumnInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeListColumnInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTreeListColumnInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -2756,7 +2880,7 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -2772,7 +2896,7 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -2814,7 +2938,7 @@ static PyObject *_wrap_new_TreeListCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreTreeListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreTreeListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *result;
     char *kwnames[] = {
@@ -2837,7 +2961,7 @@ static PyObject *_wrap_new_PreTreeListCtrl(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -2873,7 +2997,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -2889,7 +3013,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -2932,7 +3056,7 @@ static PyObject *_wrap_TreeListCtrl_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2963,7 +3087,7 @@ static PyObject *_wrap_TreeListCtrl__setCallbackInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t result;
@@ -2982,14 +3106,14 @@ static PyObject *_wrap_TreeListCtrl_GetCount(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     unsigned int result;
@@ -3008,14 +3132,14 @@ static PyObject *_wrap_TreeListCtrl_GetIndent(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     unsigned int arg2 ;
@@ -3028,7 +3152,7 @@ static PyObject *_wrap_TreeListCtrl_SetIndent(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3044,7 +3168,7 @@ static PyObject *_wrap_TreeListCtrl_SetIndent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetLineSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetLineSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     unsigned int result;
@@ -3063,14 +3187,14 @@ static PyObject *_wrap_TreeListCtrl_GetLineSpacing(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetLineSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetLineSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     unsigned int arg2 ;
@@ -3083,7 +3207,7 @@ static PyObject *_wrap_TreeListCtrl_SetLineSpacing(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetLineSpacing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3099,7 +3223,7 @@ static PyObject *_wrap_TreeListCtrl_SetLineSpacing(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *result;
@@ -3127,7 +3251,7 @@ static PyObject *_wrap_TreeListCtrl_GetImageList(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *result;
@@ -3155,7 +3279,7 @@ static PyObject *_wrap_TreeListCtrl_GetStateImageList(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *result;
@@ -3183,7 +3307,7 @@ static PyObject *_wrap_TreeListCtrl_GetButtonsImageList(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -3212,7 +3336,7 @@ static PyObject *_wrap_TreeListCtrl_SetImageList(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetStateImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -3241,7 +3365,7 @@ static PyObject *_wrap_TreeListCtrl_SetStateImageList(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetButtonsImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetButtonsImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -3270,7 +3394,7 @@ static PyObject *_wrap_TreeListCtrl_SetButtonsImageList(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AssignImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -3299,7 +3423,7 @@ static PyObject *_wrap_TreeListCtrl_AssignImageList(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AssignStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AssignStateImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -3328,7 +3452,7 @@ static PyObject *_wrap_TreeListCtrl_AssignStateImageList(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AssignButtonsImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AssignButtonsImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -3357,7 +3481,7 @@ static PyObject *_wrap_TreeListCtrl_AssignButtonsImageList(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -3398,7 +3522,7 @@ static PyObject *_wrap_TreeListCtrl_AddColumn(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AddColumnInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AddColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeListColumnInfo *arg2 = 0 ;
@@ -3432,7 +3556,7 @@ static PyObject *_wrap_TreeListCtrl_AddColumnInfo(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3448,7 +3572,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -3477,7 +3601,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumn(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3492,7 +3616,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumnInfo(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -3515,7 +3639,7 @@ static PyObject *_wrap_TreeListCtrl_InsertColumnInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TreeListCtrl_RemoveColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_RemoveColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3528,7 +3652,7 @@ static PyObject *_wrap_TreeListCtrl_RemoveColumn(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_RemoveColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3544,7 +3668,7 @@ static PyObject *_wrap_TreeListCtrl_RemoveColumn(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetColumnCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetColumnCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t result;
@@ -3563,14 +3687,14 @@ static PyObject *_wrap_TreeListCtrl_GetColumnCount(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3585,9 +3709,9 @@ static PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+    arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3603,7 +3727,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnWidth(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3617,7 +3741,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3626,14 +3750,14 @@ static PyObject *_wrap_TreeListCtrl_GetColumnWidth(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3646,7 +3770,7 @@ static PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_SetMainColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3662,7 +3786,7 @@ static PyObject *_wrap_TreeListCtrl_SetMainColumn(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t result;
@@ -3681,14 +3805,14 @@ static PyObject *_wrap_TreeListCtrl_GetMainColumn(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3704,7 +3828,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -3733,7 +3857,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3747,7 +3871,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnText",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3769,7 +3893,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3784,7 +3908,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxTreeListColumnInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -3807,7 +3931,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumn(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3821,7 +3945,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3840,7 +3964,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumn(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3855,9 +3979,9 @@ static PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (wxTreeListColumnAlign) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3873,7 +3997,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnAlignment(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3887,7 +4011,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnAlignment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3896,14 +4020,14 @@ static PyObject *_wrap_TreeListCtrl_GetColumnAlignment(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3918,9 +4042,9 @@ static PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_SetColumnImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3936,7 +4060,7 @@ static PyObject *_wrap_TreeListCtrl_SetColumnImage(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3950,7 +4074,7 @@ static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_GetColumnImage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3959,14 +4083,14 @@ static PyObject *_wrap_TreeListCtrl_GetColumnImage(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -3981,9 +4105,9 @@ static PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TreeListCtrl_ShowColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3999,7 +4123,7 @@ static PyObject *_wrap_TreeListCtrl_ShowColumn(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     size_t arg2 ;
@@ -4013,7 +4137,7 @@ static PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_IsColumnShown",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4031,7 +4155,7 @@ static PyObject *_wrap_TreeListCtrl_IsColumnShown(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4055,7 +4179,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *self, PyObject *args,
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4078,7 +4202,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4104,11 +4228,11 @@ static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args,
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (wxTreeItemIcon) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4118,14 +4242,14 @@ static PyObject *_wrap_TreeListCtrl_GetItemImage(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4156,7 +4280,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args,
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4181,7 +4305,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4207,14 +4331,14 @@ static PyObject *_wrap_TreeListCtrl_SetItemImage(PyObject *self, PyObject *args,
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (wxTreeItemIcon) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4231,7 +4355,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemImage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4266,7 +4390,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4304,7 +4428,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemPyData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4339,7 +4463,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemPyData(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemPyData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4376,7 +4500,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemPyData(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4399,7 +4523,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4416,7 +4540,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemHasChildren(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4439,7 +4563,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *self, PyObject *args,
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4456,7 +4580,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemBold(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4497,7 +4621,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemTextColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4538,7 +4662,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemBackgroundColour(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4581,7 +4705,7 @@ static PyObject *_wrap_TreeListCtrl_SetItemFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4618,7 +4742,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemBold(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4657,7 +4781,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemTextColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4696,7 +4820,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemBackgroundColour(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4735,7 +4859,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_IsVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4772,7 +4896,7 @@ static PyObject *_wrap_TreeListCtrl_IsVisible(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4809,7 +4933,7 @@ static PyObject *_wrap_TreeListCtrl_ItemHasChildren(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TreeListCtrl_IsExpanded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_IsExpanded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4846,7 +4970,7 @@ static PyObject *_wrap_TreeListCtrl_IsExpanded(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeListCtrl_IsSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_IsSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4883,7 +5007,7 @@ static PyObject *_wrap_TreeListCtrl_IsSelected(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeListCtrl_IsBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_IsBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4920,7 +5044,7 @@ static PyObject *_wrap_TreeListCtrl_IsBold(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -4944,7 +5068,7 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4954,14 +5078,14 @@ static PyObject *_wrap_TreeListCtrl_GetChildrenCount(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetRootItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetRootItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId result;
@@ -4991,7 +5115,7 @@ static PyObject *_wrap_TreeListCtrl_GetRootItem(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId result;
@@ -5021,7 +5145,7 @@ static PyObject *_wrap_TreeListCtrl_GetSelection(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetSelections(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     PyObject *result;
@@ -5047,7 +5171,7 @@ static PyObject *_wrap_TreeListCtrl_GetSelections(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetItemParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetItemParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5086,7 +5210,7 @@ static PyObject *_wrap_TreeListCtrl_GetItemParent(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetFirstChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5121,7 +5245,7 @@ static PyObject *_wrap_TreeListCtrl_GetFirstChild(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5159,7 +5283,7 @@ static PyObject *_wrap_TreeListCtrl_GetNextChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5198,7 +5322,7 @@ static PyObject *_wrap_TreeListCtrl_GetLastChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5237,7 +5361,7 @@ static PyObject *_wrap_TreeListCtrl_GetNextSibling(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5276,7 +5400,7 @@ static PyObject *_wrap_TreeListCtrl_GetPrevSibling(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId result;
@@ -5306,7 +5430,7 @@ static PyObject *_wrap_TreeListCtrl_GetFirstVisibleItem(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5345,7 +5469,7 @@ static PyObject *_wrap_TreeListCtrl_GetNextVisible(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5384,7 +5508,7 @@ static PyObject *_wrap_TreeListCtrl_GetPrevVisible(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5423,7 +5547,7 @@ static PyObject *_wrap_TreeListCtrl_GetNext(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -5450,11 +5574,11 @@ static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyOb
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -5487,7 +5611,7 @@ static PyObject *_wrap_TreeListCtrl_AddRoot(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5523,11 +5647,11 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args,
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -5560,7 +5684,7 @@ static PyObject *_wrap_TreeListCtrl_PrependItem(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5605,11 +5729,11 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -5642,7 +5766,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItem(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5674,7 +5798,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+    arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -5682,11 +5806,11 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -5719,7 +5843,7 @@ static PyObject *_wrap_TreeListCtrl_InsertItemBefore(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5755,11 +5879,11 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -5792,7 +5916,7 @@ static PyObject *_wrap_TreeListCtrl_AppendItem(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5826,7 +5950,7 @@ static PyObject *_wrap_TreeListCtrl_Delete(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl_DeleteChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_DeleteChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5860,7 +5984,7 @@ static PyObject *_wrap_TreeListCtrl_DeleteChildren(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5885,7 +6009,7 @@ static PyObject *_wrap_TreeListCtrl_DeleteAllItems(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Expand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Expand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5919,7 +6043,7 @@ static PyObject *_wrap_TreeListCtrl_Expand(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl_ExpandAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_ExpandAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5953,7 +6077,7 @@ static PyObject *_wrap_TreeListCtrl_ExpandAll(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Collapse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Collapse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -5987,7 +6111,7 @@ static PyObject *_wrap_TreeListCtrl_Collapse(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeListCtrl_CollapseAndReset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_CollapseAndReset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6021,7 +6145,7 @@ static PyObject *_wrap_TreeListCtrl_CollapseAndReset(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6055,7 +6179,7 @@ static PyObject *_wrap_TreeListCtrl_Toggle(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Unselect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Unselect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6080,7 +6204,7 @@ static PyObject *_wrap_TreeListCtrl_Unselect(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeListCtrl_UnselectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_UnselectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6105,7 +6229,7 @@ static PyObject *_wrap_TreeListCtrl_UnselectAll(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6130,11 +6254,11 @@ static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *self, PyObject *args, P
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6151,7 +6275,7 @@ static PyObject *_wrap_TreeListCtrl_SelectItem(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     bool arg2 = (bool) False ;
@@ -6165,7 +6289,7 @@ static PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6182,7 +6306,7 @@ static PyObject *_wrap_TreeListCtrl_SelectAll(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_EnsureVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6216,7 +6340,7 @@ static PyObject *_wrap_TreeListCtrl_EnsureVisible(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeListCtrl_ScrollTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_ScrollTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6250,7 +6374,7 @@ static PyObject *_wrap_TreeListCtrl_ScrollTo(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeListCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -6259,15 +6383,17 @@ static PyObject *_wrap_TreeListCtrl_HitTest(PyObject *self, PyObject *args, PyOb
     wxTreeItemId result;
     wxPoint temp2 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "point", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeListCtrl_HitTest",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -6287,21 +6413,17 @@ static PyObject *_wrap_TreeListCtrl_HitTest(PyObject *self, PyObject *args, PyOb
         resultptr = new wxTreeItemId((wxTreeItemId &) result);
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxTreeItemId, 1);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6325,7 +6447,7 @@ static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *self, PyObject *ar
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6342,7 +6464,7 @@ static PyObject *_wrap_TreeListCtrl_GetBoundingRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6376,7 +6498,7 @@ static PyObject *_wrap_TreeListCtrl_EditLabel(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeListCtrl_Edit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_Edit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6410,7 +6532,7 @@ static PyObject *_wrap_TreeListCtrl_Edit(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeListCtrl_SortChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_SortChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6444,7 +6566,7 @@ static PyObject *_wrap_TreeListCtrl_SortChildren(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeListCtrl_FindItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_FindItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -6476,7 +6598,7 @@ static PyObject *_wrap_TreeListCtrl_FindItem(PyObject *self, PyObject *args, PyO
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6505,7 +6627,7 @@ static PyObject *_wrap_TreeListCtrl_FindItem(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetHeaderWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetHeaderWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxWindow *result;
@@ -6533,7 +6655,7 @@ static PyObject *_wrap_TreeListCtrl_GetHeaderWindow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TreeListCtrl_GetMainWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeListCtrl_GetMainWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
     wxScrolledWindow *result;
@@ -6561,7 +6683,7 @@ static PyObject *_wrap_TreeListCtrl_GetMainWindow(PyObject *self, PyObject *args
 }
 
 
-static PyObject * TreeListCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeListCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTreeListCtrl, obj);
@@ -6569,170 +6691,170 @@ static PyObject * TreeListCtrl_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_DynamicSashSplitEvent", (PyCFunction) _wrap_new_DynamicSashSplitEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DynamicSashSplitEvent_swigregister", DynamicSashSplitEvent_swigregister, METH_VARARGS },
-        { (char *)"new_DynamicSashUnifyEvent", (PyCFunction) _wrap_new_DynamicSashUnifyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DynamicSashUnifyEvent_swigregister", DynamicSashUnifyEvent_swigregister, METH_VARARGS },
-        { (char *)"new_DynamicSashWindow", (PyCFunction) _wrap_new_DynamicSashWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreDynamicSashWindow", (PyCFunction) _wrap_new_PreDynamicSashWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DynamicSashWindow_Create", (PyCFunction) _wrap_DynamicSashWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DynamicSashWindow_GetHScrollBar", (PyCFunction) _wrap_DynamicSashWindow_GetHScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DynamicSashWindow_GetVScrollBar", (PyCFunction) _wrap_DynamicSashWindow_GetVScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DynamicSashWindow_swigregister", DynamicSashWindow_swigregister, METH_VARARGS },
-        { (char *)"new_EditableListBox", (PyCFunction) _wrap_new_EditableListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_SetStrings", (PyCFunction) _wrap_EditableListBox_SetStrings, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetStrings", (PyCFunction) _wrap_EditableListBox_GetStrings, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetListCtrl", (PyCFunction) _wrap_EditableListBox_GetListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetDelButton", (PyCFunction) _wrap_EditableListBox_GetDelButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetNewButton", (PyCFunction) _wrap_EditableListBox_GetNewButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetUpButton", (PyCFunction) _wrap_EditableListBox_GetUpButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetDownButton", (PyCFunction) _wrap_EditableListBox_GetDownButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_GetEditButton", (PyCFunction) _wrap_EditableListBox_GetEditButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EditableListBox_swigregister", EditableListBox_swigregister, METH_VARARGS },
-        { (char *)"new_RemotelyScrolledTreeCtrl", (PyCFunction) _wrap_new_RemotelyScrolledTreeCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_HideVScrollbar", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_HideVScrollbar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_GetScrolledWindow", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_GetScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_ScrollToLine", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_ScrollToLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_SetCompanionWindow", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_SetCompanionWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_GetCompanionWindow", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_GetCompanionWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RemotelyScrolledTreeCtrl_swigregister", RemotelyScrolledTreeCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_TreeCompanionWindow", (PyCFunction) _wrap_new_TreeCompanionWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCompanionWindow__setCallbackInfo", (PyCFunction) _wrap_TreeCompanionWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCompanionWindow_GetTreeCtrl", (PyCFunction) _wrap_TreeCompanionWindow_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCompanionWindow_SetTreeCtrl", (PyCFunction) _wrap_TreeCompanionWindow_SetTreeCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCompanionWindow_swigregister", TreeCompanionWindow_swigregister, METH_VARARGS },
-        { (char *)"new_ThinSplitterWindow", (PyCFunction) _wrap_new_ThinSplitterWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ThinSplitterWindow_swigregister", ThinSplitterWindow_swigregister, METH_VARARGS },
-        { (char *)"new_SplitterScrolledWindow", (PyCFunction) _wrap_new_SplitterScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterScrolledWindow_swigregister", SplitterScrolledWindow_swigregister, METH_VARARGS },
-        { (char *)"new_LEDNumberCtrl", (PyCFunction) _wrap_new_LEDNumberCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreLEDNumberCtrl", (PyCFunction) _wrap_new_PreLEDNumberCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_Create", (PyCFunction) _wrap_LEDNumberCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_GetAlignment", (PyCFunction) _wrap_LEDNumberCtrl_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_GetDrawFaded", (PyCFunction) _wrap_LEDNumberCtrl_GetDrawFaded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_GetValue", (PyCFunction) _wrap_LEDNumberCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_SetAlignment", (PyCFunction) _wrap_LEDNumberCtrl_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_SetDrawFaded", (PyCFunction) _wrap_LEDNumberCtrl_SetDrawFaded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_SetValue", (PyCFunction) _wrap_LEDNumberCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LEDNumberCtrl_swigregister", LEDNumberCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_GetShown", (PyCFunction) _wrap_TreeListColumnInfo_GetShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_GetText", (PyCFunction) _wrap_TreeListColumnInfo_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_GetImage", (PyCFunction) _wrap_TreeListColumnInfo_GetImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_GetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_GetSelectedImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_GetWidth", (PyCFunction) _wrap_TreeListColumnInfo_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_SetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_SetText", (PyCFunction) _wrap_TreeListColumnInfo_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_SetImage", (PyCFunction) _wrap_TreeListColumnInfo_SetImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_SetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_SetSelectedImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_SetWidth", (PyCFunction) _wrap_TreeListColumnInfo_SetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListColumnInfo_swigregister", TreeListColumnInfo_swigregister, METH_VARARGS },
-        { (char *)"new_TreeListCtrl", (PyCFunction) _wrap_new_TreeListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreTreeListCtrl", (PyCFunction) _wrap_new_PreTreeListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Create", (PyCFunction) _wrap_TreeListCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl__setCallbackInfo", (PyCFunction) _wrap_TreeListCtrl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetCount", (PyCFunction) _wrap_TreeListCtrl_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetIndent", (PyCFunction) _wrap_TreeListCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetIndent", (PyCFunction) _wrap_TreeListCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetLineSpacing", (PyCFunction) _wrap_TreeListCtrl_GetLineSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetLineSpacing", (PyCFunction) _wrap_TreeListCtrl_SetLineSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetImageList", (PyCFunction) _wrap_TreeListCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetStateImageList", (PyCFunction) _wrap_TreeListCtrl_GetStateImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetButtonsImageList", (PyCFunction) _wrap_TreeListCtrl_GetButtonsImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetImageList", (PyCFunction) _wrap_TreeListCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetStateImageList", (PyCFunction) _wrap_TreeListCtrl_SetStateImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetButtonsImageList", (PyCFunction) _wrap_TreeListCtrl_SetButtonsImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AssignImageList", (PyCFunction) _wrap_TreeListCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AssignStateImageList", (PyCFunction) _wrap_TreeListCtrl_AssignStateImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AssignButtonsImageList", (PyCFunction) _wrap_TreeListCtrl_AssignButtonsImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AddColumn", (PyCFunction) _wrap_TreeListCtrl_AddColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AddColumnInfo", (PyCFunction) _wrap_TreeListCtrl_AddColumnInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_InsertColumn", (PyCFunction) _wrap_TreeListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_InsertColumnInfo", (PyCFunction) _wrap_TreeListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_RemoveColumn", (PyCFunction) _wrap_TreeListCtrl_RemoveColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetColumnCount", (PyCFunction) _wrap_TreeListCtrl_GetColumnCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetMainColumn", (PyCFunction) _wrap_TreeListCtrl_SetMainColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetMainColumn", (PyCFunction) _wrap_TreeListCtrl_GetMainColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetColumn", (PyCFunction) _wrap_TreeListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetColumn", (PyCFunction) _wrap_TreeListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_SetColumnAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_GetColumnAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetColumnImage", (PyCFunction) _wrap_TreeListCtrl_SetColumnImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetColumnImage", (PyCFunction) _wrap_TreeListCtrl_GetColumnImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_ShowColumn", (PyCFunction) _wrap_TreeListCtrl_ShowColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_IsColumnShown", (PyCFunction) _wrap_TreeListCtrl_IsColumnShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemText", (PyCFunction) _wrap_TreeListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemImage", (PyCFunction) _wrap_TreeListCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemText", (PyCFunction) _wrap_TreeListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemImage", (PyCFunction) _wrap_TreeListCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemData", (PyCFunction) _wrap_TreeListCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemData", (PyCFunction) _wrap_TreeListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemPyData", (PyCFunction) _wrap_TreeListCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemPyData", (PyCFunction) _wrap_TreeListCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemBold", (PyCFunction) _wrap_TreeListCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SetItemFont", (PyCFunction) _wrap_TreeListCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_IsVisible", (PyCFunction) _wrap_TreeListCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_IsExpanded", (PyCFunction) _wrap_TreeListCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_IsSelected", (PyCFunction) _wrap_TreeListCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_IsBold", (PyCFunction) _wrap_TreeListCtrl_IsBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetChildrenCount", (PyCFunction) _wrap_TreeListCtrl_GetChildrenCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetRootItem", (PyCFunction) _wrap_TreeListCtrl_GetRootItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetSelection", (PyCFunction) _wrap_TreeListCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetSelections", (PyCFunction) _wrap_TreeListCtrl_GetSelections, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetItemParent", (PyCFunction) _wrap_TreeListCtrl_GetItemParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetFirstChild", (PyCFunction) _wrap_TreeListCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetNextChild", (PyCFunction) _wrap_TreeListCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetLastChild", (PyCFunction) _wrap_TreeListCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetNextSibling", (PyCFunction) _wrap_TreeListCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeListCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeListCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetNextVisible", (PyCFunction) _wrap_TreeListCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeListCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AddRoot", (PyCFunction) _wrap_TreeListCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_PrependItem", (PyCFunction) _wrap_TreeListCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_InsertItem", (PyCFunction) _wrap_TreeListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_InsertItemBefore", (PyCFunction) _wrap_TreeListCtrl_InsertItemBefore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_AppendItem", (PyCFunction) _wrap_TreeListCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Delete", (PyCFunction) _wrap_TreeListCtrl_Delete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_DeleteChildren", (PyCFunction) _wrap_TreeListCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_DeleteAllItems", (PyCFunction) _wrap_TreeListCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Expand", (PyCFunction) _wrap_TreeListCtrl_Expand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_ExpandAll", (PyCFunction) _wrap_TreeListCtrl_ExpandAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Collapse", (PyCFunction) _wrap_TreeListCtrl_Collapse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeListCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Toggle", (PyCFunction) _wrap_TreeListCtrl_Toggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Unselect", (PyCFunction) _wrap_TreeListCtrl_Unselect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_UnselectAll", (PyCFunction) _wrap_TreeListCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SelectItem", (PyCFunction) _wrap_TreeListCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SelectAll", (PyCFunction) _wrap_TreeListCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_EnsureVisible", (PyCFunction) _wrap_TreeListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_ScrollTo", (PyCFunction) _wrap_TreeListCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_HitTest", (PyCFunction) _wrap_TreeListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeListCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_EditLabel", (PyCFunction) _wrap_TreeListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_Edit", (PyCFunction) _wrap_TreeListCtrl_Edit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_SortChildren", (PyCFunction) _wrap_TreeListCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_FindItem", (PyCFunction) _wrap_TreeListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetHeaderWindow", (PyCFunction) _wrap_TreeListCtrl_GetHeaderWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_GetMainWindow", (PyCFunction) _wrap_TreeListCtrl_GetMainWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeListCtrl_swigregister", TreeListCtrl_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_DynamicSashSplitEvent", (PyCFunction) _wrap_new_DynamicSashSplitEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DynamicSashSplitEvent_swigregister", DynamicSashSplitEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DynamicSashUnifyEvent", (PyCFunction) _wrap_new_DynamicSashUnifyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DynamicSashUnifyEvent_swigregister", DynamicSashUnifyEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DynamicSashWindow", (PyCFunction) _wrap_new_DynamicSashWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreDynamicSashWindow", (PyCFunction) _wrap_new_PreDynamicSashWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DynamicSashWindow_Create", (PyCFunction) _wrap_DynamicSashWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DynamicSashWindow_GetHScrollBar", (PyCFunction) _wrap_DynamicSashWindow_GetHScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DynamicSashWindow_GetVScrollBar", (PyCFunction) _wrap_DynamicSashWindow_GetVScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DynamicSashWindow_swigregister", DynamicSashWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_EditableListBox", (PyCFunction) _wrap_new_EditableListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_SetStrings", (PyCFunction) _wrap_EditableListBox_SetStrings, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetStrings", (PyCFunction) _wrap_EditableListBox_GetStrings, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetListCtrl", (PyCFunction) _wrap_EditableListBox_GetListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetDelButton", (PyCFunction) _wrap_EditableListBox_GetDelButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetNewButton", (PyCFunction) _wrap_EditableListBox_GetNewButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetUpButton", (PyCFunction) _wrap_EditableListBox_GetUpButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetDownButton", (PyCFunction) _wrap_EditableListBox_GetDownButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_GetEditButton", (PyCFunction) _wrap_EditableListBox_GetEditButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EditableListBox_swigregister", EditableListBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_RemotelyScrolledTreeCtrl", (PyCFunction) _wrap_new_RemotelyScrolledTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_HideVScrollbar", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_HideVScrollbar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_AdjustRemoteScrollbars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_GetScrolledWindow", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_GetScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_ScrollToLine", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_ScrollToLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_SetCompanionWindow", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_SetCompanionWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_GetCompanionWindow", (PyCFunction) _wrap_RemotelyScrolledTreeCtrl_GetCompanionWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RemotelyScrolledTreeCtrl_swigregister", RemotelyScrolledTreeCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeCompanionWindow", (PyCFunction) _wrap_new_TreeCompanionWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCompanionWindow__setCallbackInfo", (PyCFunction) _wrap_TreeCompanionWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCompanionWindow_GetTreeCtrl", (PyCFunction) _wrap_TreeCompanionWindow_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCompanionWindow_SetTreeCtrl", (PyCFunction) _wrap_TreeCompanionWindow_SetTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCompanionWindow_swigregister", TreeCompanionWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ThinSplitterWindow", (PyCFunction) _wrap_new_ThinSplitterWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ThinSplitterWindow_swigregister", ThinSplitterWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SplitterScrolledWindow", (PyCFunction) _wrap_new_SplitterScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterScrolledWindow_swigregister", SplitterScrolledWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LEDNumberCtrl", (PyCFunction) _wrap_new_LEDNumberCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreLEDNumberCtrl", (PyCFunction) _wrap_new_PreLEDNumberCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_Create", (PyCFunction) _wrap_LEDNumberCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_GetAlignment", (PyCFunction) _wrap_LEDNumberCtrl_GetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_GetDrawFaded", (PyCFunction) _wrap_LEDNumberCtrl_GetDrawFaded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_GetValue", (PyCFunction) _wrap_LEDNumberCtrl_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_SetAlignment", (PyCFunction) _wrap_LEDNumberCtrl_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_SetDrawFaded", (PyCFunction) _wrap_LEDNumberCtrl_SetDrawFaded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_SetValue", (PyCFunction) _wrap_LEDNumberCtrl_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LEDNumberCtrl_swigregister", LEDNumberCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeListColumnInfo", (PyCFunction) _wrap_new_TreeListColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_GetShown", (PyCFunction) _wrap_TreeListColumnInfo_GetShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_GetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_GetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_GetText", (PyCFunction) _wrap_TreeListColumnInfo_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_GetImage", (PyCFunction) _wrap_TreeListColumnInfo_GetImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_GetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_GetSelectedImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_GetWidth", (PyCFunction) _wrap_TreeListColumnInfo_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_SetShown", (PyCFunction) _wrap_TreeListColumnInfo_SetShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_SetAlignment", (PyCFunction) _wrap_TreeListColumnInfo_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_SetText", (PyCFunction) _wrap_TreeListColumnInfo_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_SetImage", (PyCFunction) _wrap_TreeListColumnInfo_SetImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_SetSelectedImage", (PyCFunction) _wrap_TreeListColumnInfo_SetSelectedImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_SetWidth", (PyCFunction) _wrap_TreeListColumnInfo_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListColumnInfo_swigregister", TreeListColumnInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeListCtrl", (PyCFunction) _wrap_new_TreeListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreTreeListCtrl", (PyCFunction) _wrap_new_PreTreeListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Create", (PyCFunction) _wrap_TreeListCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl__setCallbackInfo", (PyCFunction) _wrap_TreeListCtrl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetCount", (PyCFunction) _wrap_TreeListCtrl_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetIndent", (PyCFunction) _wrap_TreeListCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetIndent", (PyCFunction) _wrap_TreeListCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetLineSpacing", (PyCFunction) _wrap_TreeListCtrl_GetLineSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetLineSpacing", (PyCFunction) _wrap_TreeListCtrl_SetLineSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetImageList", (PyCFunction) _wrap_TreeListCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetStateImageList", (PyCFunction) _wrap_TreeListCtrl_GetStateImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetButtonsImageList", (PyCFunction) _wrap_TreeListCtrl_GetButtonsImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetImageList", (PyCFunction) _wrap_TreeListCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetStateImageList", (PyCFunction) _wrap_TreeListCtrl_SetStateImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetButtonsImageList", (PyCFunction) _wrap_TreeListCtrl_SetButtonsImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AssignImageList", (PyCFunction) _wrap_TreeListCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AssignStateImageList", (PyCFunction) _wrap_TreeListCtrl_AssignStateImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AssignButtonsImageList", (PyCFunction) _wrap_TreeListCtrl_AssignButtonsImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AddColumn", (PyCFunction) _wrap_TreeListCtrl_AddColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AddColumnInfo", (PyCFunction) _wrap_TreeListCtrl_AddColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_InsertColumn", (PyCFunction) _wrap_TreeListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_InsertColumnInfo", (PyCFunction) _wrap_TreeListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_RemoveColumn", (PyCFunction) _wrap_TreeListCtrl_RemoveColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetColumnCount", (PyCFunction) _wrap_TreeListCtrl_GetColumnCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetColumnWidth", (PyCFunction) _wrap_TreeListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetMainColumn", (PyCFunction) _wrap_TreeListCtrl_SetMainColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetMainColumn", (PyCFunction) _wrap_TreeListCtrl_GetMainColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetColumnText", (PyCFunction) _wrap_TreeListCtrl_SetColumnText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetColumnText", (PyCFunction) _wrap_TreeListCtrl_GetColumnText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetColumn", (PyCFunction) _wrap_TreeListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetColumn", (PyCFunction) _wrap_TreeListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_SetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetColumnAlignment", (PyCFunction) _wrap_TreeListCtrl_GetColumnAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetColumnImage", (PyCFunction) _wrap_TreeListCtrl_SetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetColumnImage", (PyCFunction) _wrap_TreeListCtrl_GetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_ShowColumn", (PyCFunction) _wrap_TreeListCtrl_ShowColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_IsColumnShown", (PyCFunction) _wrap_TreeListCtrl_IsColumnShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemText", (PyCFunction) _wrap_TreeListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemImage", (PyCFunction) _wrap_TreeListCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemText", (PyCFunction) _wrap_TreeListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemImage", (PyCFunction) _wrap_TreeListCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemData", (PyCFunction) _wrap_TreeListCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemData", (PyCFunction) _wrap_TreeListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemPyData", (PyCFunction) _wrap_TreeListCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemPyData", (PyCFunction) _wrap_TreeListCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemBold", (PyCFunction) _wrap_TreeListCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SetItemFont", (PyCFunction) _wrap_TreeListCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemBold", (PyCFunction) _wrap_TreeListCtrl_GetItemBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemFont", (PyCFunction) _wrap_TreeListCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_IsVisible", (PyCFunction) _wrap_TreeListCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeListCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_IsExpanded", (PyCFunction) _wrap_TreeListCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_IsSelected", (PyCFunction) _wrap_TreeListCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_IsBold", (PyCFunction) _wrap_TreeListCtrl_IsBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetChildrenCount", (PyCFunction) _wrap_TreeListCtrl_GetChildrenCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetRootItem", (PyCFunction) _wrap_TreeListCtrl_GetRootItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetSelection", (PyCFunction) _wrap_TreeListCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetSelections", (PyCFunction) _wrap_TreeListCtrl_GetSelections, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetItemParent", (PyCFunction) _wrap_TreeListCtrl_GetItemParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetFirstChild", (PyCFunction) _wrap_TreeListCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetNextChild", (PyCFunction) _wrap_TreeListCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetLastChild", (PyCFunction) _wrap_TreeListCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetNextSibling", (PyCFunction) _wrap_TreeListCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeListCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeListCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetNextVisible", (PyCFunction) _wrap_TreeListCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeListCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetNext", (PyCFunction) _wrap_TreeListCtrl_GetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AddRoot", (PyCFunction) _wrap_TreeListCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_PrependItem", (PyCFunction) _wrap_TreeListCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_InsertItem", (PyCFunction) _wrap_TreeListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_InsertItemBefore", (PyCFunction) _wrap_TreeListCtrl_InsertItemBefore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_AppendItem", (PyCFunction) _wrap_TreeListCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Delete", (PyCFunction) _wrap_TreeListCtrl_Delete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_DeleteChildren", (PyCFunction) _wrap_TreeListCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_DeleteAllItems", (PyCFunction) _wrap_TreeListCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Expand", (PyCFunction) _wrap_TreeListCtrl_Expand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_ExpandAll", (PyCFunction) _wrap_TreeListCtrl_ExpandAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Collapse", (PyCFunction) _wrap_TreeListCtrl_Collapse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeListCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Toggle", (PyCFunction) _wrap_TreeListCtrl_Toggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Unselect", (PyCFunction) _wrap_TreeListCtrl_Unselect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_UnselectAll", (PyCFunction) _wrap_TreeListCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SelectItem", (PyCFunction) _wrap_TreeListCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SelectAll", (PyCFunction) _wrap_TreeListCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_EnsureVisible", (PyCFunction) _wrap_TreeListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_ScrollTo", (PyCFunction) _wrap_TreeListCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_HitTest", (PyCFunction) _wrap_TreeListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeListCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_EditLabel", (PyCFunction) _wrap_TreeListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_Edit", (PyCFunction) _wrap_TreeListCtrl_Edit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_SortChildren", (PyCFunction) _wrap_TreeListCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_FindItem", (PyCFunction) _wrap_TreeListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetHeaderWindow", (PyCFunction) _wrap_TreeListCtrl_GetHeaderWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_GetMainWindow", (PyCFunction) _wrap_TreeListCtrl_GetMainWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeListCtrl_swigregister", TreeListCtrl_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -8278,7 +8400,7 @@ _swigt__p_int,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -8308,28 +8430,28 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"DynamicSashNameStr",_wrap_DynamicSashNameStr_get, _wrap_DynamicSashNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"EditableListBoxNameStr",_wrap_EditableListBoxNameStr_get, _wrap_EditableListBoxNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TreeListCtrlNameStr",_wrap_TreeListCtrlNameStr_get, _wrap_TreeListCtrlNameStr_set);
-    PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_SPLIT", SWIG_FromInt((int)wxEVT_DYNAMIC_SASH_SPLIT));
-    PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_UNIFY", SWIG_FromInt((int)wxEVT_DYNAMIC_SASH_UNIFY));
-    PyDict_SetItemString(d,"DS_MANAGE_SCROLLBARS", SWIG_FromInt((int)wxDS_MANAGE_SCROLLBARS));
-    PyDict_SetItemString(d,"DS_DRAG_CORNER", SWIG_FromInt((int)wxDS_DRAG_CORNER));
-    PyDict_SetItemString(d,"EL_ALLOW_NEW", SWIG_FromInt((int)wxEL_ALLOW_NEW));
-    PyDict_SetItemString(d,"EL_ALLOW_EDIT", SWIG_FromInt((int)wxEL_ALLOW_EDIT));
-    PyDict_SetItemString(d,"EL_ALLOW_DELETE", SWIG_FromInt((int)wxEL_ALLOW_DELETE));
-    PyDict_SetItemString(d,"LED_ALIGN_LEFT", SWIG_FromInt((int)wxLED_ALIGN_LEFT));
-    PyDict_SetItemString(d,"LED_ALIGN_RIGHT", SWIG_FromInt((int)wxLED_ALIGN_RIGHT));
-    PyDict_SetItemString(d,"LED_ALIGN_CENTER", SWIG_FromInt((int)wxLED_ALIGN_CENTER));
-    PyDict_SetItemString(d,"LED_ALIGN_MASK", SWIG_FromInt((int)wxLED_ALIGN_MASK));
-    PyDict_SetItemString(d,"LED_DRAW_FADED", SWIG_FromInt((int)wxLED_DRAW_FADED));
-    PyDict_SetItemString(d,"TL_ALIGN_LEFT", SWIG_FromInt((int)wxTL_ALIGN_LEFT));
-    PyDict_SetItemString(d,"TL_ALIGN_RIGHT", SWIG_FromInt((int)wxTL_ALIGN_RIGHT));
-    PyDict_SetItemString(d,"TL_ALIGN_CENTER", SWIG_FromInt((int)wxTL_ALIGN_CENTER));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMCOLUMN", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMCOLUMN));
-    PyDict_SetItemString(d,"TL_SEARCH_VISIBLE", SWIG_FromInt((int)wxTL_SEARCH_VISIBLE));
-    PyDict_SetItemString(d,"TL_SEARCH_LEVEL", SWIG_FromInt((int)wxTL_SEARCH_LEVEL));
-    PyDict_SetItemString(d,"TL_SEARCH_FULL", SWIG_FromInt((int)wxTL_SEARCH_FULL));
-    PyDict_SetItemString(d,"TL_SEARCH_PARTIAL", SWIG_FromInt((int)wxTL_SEARCH_PARTIAL));
-    PyDict_SetItemString(d,"TL_SEARCH_NOCASE", SWIG_FromInt((int)wxTL_SEARCH_NOCASE));
-    PyDict_SetItemString(d,"TR_DONT_ADJUST_MAC", SWIG_FromInt((int)wxTR_DONT_ADJUST_MAC));
+    PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_SPLIT", SWIG_From_int((int)wxEVT_DYNAMIC_SASH_SPLIT));
+    PyDict_SetItemString(d,"wxEVT_DYNAMIC_SASH_UNIFY", SWIG_From_int((int)wxEVT_DYNAMIC_SASH_UNIFY));
+    PyDict_SetItemString(d,"DS_MANAGE_SCROLLBARS", SWIG_From_int((int)wxDS_MANAGE_SCROLLBARS));
+    PyDict_SetItemString(d,"DS_DRAG_CORNER", SWIG_From_int((int)wxDS_DRAG_CORNER));
+    PyDict_SetItemString(d,"EL_ALLOW_NEW", SWIG_From_int((int)wxEL_ALLOW_NEW));
+    PyDict_SetItemString(d,"EL_ALLOW_EDIT", SWIG_From_int((int)wxEL_ALLOW_EDIT));
+    PyDict_SetItemString(d,"EL_ALLOW_DELETE", SWIG_From_int((int)wxEL_ALLOW_DELETE));
+    PyDict_SetItemString(d,"LED_ALIGN_LEFT", SWIG_From_int((int)wxLED_ALIGN_LEFT));
+    PyDict_SetItemString(d,"LED_ALIGN_RIGHT", SWIG_From_int((int)wxLED_ALIGN_RIGHT));
+    PyDict_SetItemString(d,"LED_ALIGN_CENTER", SWIG_From_int((int)wxLED_ALIGN_CENTER));
+    PyDict_SetItemString(d,"LED_ALIGN_MASK", SWIG_From_int((int)wxLED_ALIGN_MASK));
+    PyDict_SetItemString(d,"LED_DRAW_FADED", SWIG_From_int((int)wxLED_DRAW_FADED));
+    PyDict_SetItemString(d,"TL_ALIGN_LEFT", SWIG_From_int((int)wxTL_ALIGN_LEFT));
+    PyDict_SetItemString(d,"TL_ALIGN_RIGHT", SWIG_From_int((int)wxTL_ALIGN_RIGHT));
+    PyDict_SetItemString(d,"TL_ALIGN_CENTER", SWIG_From_int((int)wxTL_ALIGN_CENTER));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMCOLUMN", SWIG_From_int((int)wxTREE_HITTEST_ONITEMCOLUMN));
+    PyDict_SetItemString(d,"TL_SEARCH_VISIBLE", SWIG_From_int((int)wxTL_SEARCH_VISIBLE));
+    PyDict_SetItemString(d,"TL_SEARCH_LEVEL", SWIG_From_int((int)wxTL_SEARCH_LEVEL));
+    PyDict_SetItemString(d,"TL_SEARCH_FULL", SWIG_From_int((int)wxTL_SEARCH_FULL));
+    PyDict_SetItemString(d,"TL_SEARCH_PARTIAL", SWIG_From_int((int)wxTL_SEARCH_PARTIAL));
+    PyDict_SetItemString(d,"TL_SEARCH_NOCASE", SWIG_From_int((int)wxTL_SEARCH_NOCASE));
+    PyDict_SetItemString(d,"TR_DONT_ADJUST_MAC", SWIG_From_int((int)wxTR_DONT_ADJUST_MAC));
     
     
     wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow");

diff --git a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
index a5fef4a814b62495cd4a2155343ce1c3e222793a..8f4d5981d41fdbecfb0b6b3fc828b38169bd5c7a 100644 (file)
--- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
+++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxWindow swig_types[0] 
@@ -226,47 +228,64 @@ static swig_type_info *swig_types[9];
 
 #define SWIG_name    "_glcanvas"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -278,114 +297,180 @@ static swig_type_info *swig_types[9];
  static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas")); 
  static const wxString wxPyEmptyString(wxEmptyString); 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
-{
-  return PyObject_IsTrue(obj) ? true : false;
-}
+#include <limits.h>
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
+    }
     return 0;
-  } else {
-    return 1;
   }
+  return 1;
 }
 
-wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette,wxGLContext const *other){
-            AGLPixelFormat fmt;  // TODO: How should this be initialized?
-            return new wxGLContext(fmt, win, palette, other);
-        }
 
-#include <limits.h>
-
-
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-  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);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
     }
-  }
-  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;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
     return 1;
   }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
+{
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
+}
+
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIG_Check_bool(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}
+
+wxGLContext *new_wxGLContext(bool isRGB,wxGLCanvas *win,wxPalette const &palette,wxGLContext const *other){
+            AGLPixelFormat fmt;  // TODO: How should this be initialized?
+            return new wxGLContext(fmt, win, palette, other);
+        }
+
+SWIGSTATICINLINE(int)
+SWIG_As_int(PyObject* obj)
+{
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
+  }
+  return v;
+}
+
+
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
+{
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_GLCanvasNameStr_set(PyObject *_val) {
+static int _wrap_GLCanvasNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GLCanvasNameStr is read-only.");
     return 1;
 }
@@ -405,7 +490,7 @@ static PyObject *_wrap_GLCanvasNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GLContext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 ;
     wxGLCanvas *arg2 = (wxGLCanvas *) 0 ;
@@ -422,7 +507,7 @@ static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GLContext",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    arg1 = (bool) SWIG_AsBool(obj0); 
+    arg1 = (bool)SWIG_As_bool(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGLCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -454,7 +539,7 @@ static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_GLContext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_GLContext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLContext *arg1 = (wxGLContext *) 0 ;
     PyObject * obj0 = 0 ;
@@ -479,7 +564,7 @@ static PyObject *_wrap_delete_GLContext(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GLContext_SetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLContext_SetCurrent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLContext *arg1 = (wxGLContext *) 0 ;
     PyObject * obj0 = 0 ;
@@ -504,7 +589,7 @@ static PyObject *_wrap_GLContext_SetCurrent(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLContext_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLContext *arg1 = (wxGLContext *) 0 ;
     wxString *arg2 = 0 ;
@@ -545,7 +630,7 @@ static PyObject *_wrap_GLContext_SetColour(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GLContext_SwapBuffers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLContext_SwapBuffers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLContext *arg1 = (wxGLContext *) 0 ;
     PyObject * obj0 = 0 ;
@@ -570,7 +655,7 @@ static PyObject *_wrap_GLContext_SwapBuffers(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GLContext_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLContext_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLContext *arg1 = (wxGLContext *) 0 ;
     wxWindow *result;
@@ -598,14 +683,14 @@ static PyObject *_wrap_GLContext_GetWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * GLContext_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GLContext_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGLContext, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GLCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -640,7 +725,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -656,7 +741,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -718,7 +803,7 @@ static PyObject *_wrap_new_GLCanvas(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GLCanvasWithContext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxGLContext *arg2 = (wxGLContext *) NULL ;
@@ -759,7 +844,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -775,7 +860,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -837,7 +922,7 @@ static PyObject *_wrap_new_GLCanvasWithContext(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLCanvas *arg1 = (wxGLCanvas *) 0 ;
     PyObject * obj0 = 0 ;
@@ -862,7 +947,7 @@ static PyObject *_wrap_GLCanvas_SetCurrent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLCanvas_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLCanvas *arg1 = (wxGLCanvas *) 0 ;
     wxString *arg2 = 0 ;
@@ -903,7 +988,7 @@ static PyObject *_wrap_GLCanvas_SetColour(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLCanvas *arg1 = (wxGLCanvas *) 0 ;
     PyObject * obj0 = 0 ;
@@ -928,7 +1013,7 @@ static PyObject *_wrap_GLCanvas_SwapBuffers(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GLCanvas_GetContext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GLCanvas_GetContext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGLCanvas *arg1 = (wxGLCanvas *) 0 ;
     wxGLContext *result;
@@ -954,7 +1039,7 @@ static PyObject *_wrap_GLCanvas_GetContext(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * GLCanvas_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GLCanvas_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGLCanvas, obj);
@@ -962,21 +1047,21 @@ static PyObject * GLCanvas_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_GLContext", (PyCFunction) _wrap_new_GLContext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_GLContext", (PyCFunction) _wrap_delete_GLContext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLContext_SetCurrent", (PyCFunction) _wrap_GLContext_SetCurrent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLContext_SetColour", (PyCFunction) _wrap_GLContext_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLContext_SwapBuffers", (PyCFunction) _wrap_GLContext_SwapBuffers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLContext_GetWindow", (PyCFunction) _wrap_GLContext_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS },
-        { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_GLCanvasWithContext", (PyCFunction) _wrap_new_GLCanvasWithContext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLCanvas_SetCurrent", (PyCFunction) _wrap_GLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLCanvas_SetColour", (PyCFunction) _wrap_GLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLCanvas_SwapBuffers", (PyCFunction) _wrap_GLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLCanvas_GetContext", (PyCFunction) _wrap_GLCanvas_GetContext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GLCanvas_swigregister", GLCanvas_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_GLContext", (PyCFunction) _wrap_new_GLContext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_GLContext", (PyCFunction) _wrap_delete_GLContext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLContext_SetCurrent", (PyCFunction) _wrap_GLContext_SetCurrent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLContext_SetColour", (PyCFunction) _wrap_GLContext_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLContext_SwapBuffers", (PyCFunction) _wrap_GLContext_SwapBuffers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLContext_GetWindow", (PyCFunction) _wrap_GLContext_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_GLCanvasWithContext", (PyCFunction) _wrap_new_GLCanvasWithContext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLCanvas_SetCurrent", (PyCFunction) _wrap_GLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLCanvas_SetColour", (PyCFunction) _wrap_GLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLCanvas_SwapBuffers", (PyCFunction) _wrap_GLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLCanvas_GetContext", (PyCFunction) _wrap_GLCanvas_GetContext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GLCanvas_swigregister", GLCanvas_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -1271,7 +1356,7 @@ _swigt__p_int,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -1299,22 +1384,22 @@ SWIGEXPORT(void) SWIG_init(void) {
     
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"GLCanvasNameStr",_wrap_GLCanvasNameStr_get, _wrap_GLCanvasNameStr_set);
-    PyDict_SetItemString(d,"WX_GL_RGBA", SWIG_FromInt((int)WX_GL_RGBA));
-    PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_FromInt((int)WX_GL_BUFFER_SIZE));
-    PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_FromInt((int)WX_GL_LEVEL));
-    PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_FromInt((int)WX_GL_DOUBLEBUFFER));
-    PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_FromInt((int)WX_GL_STEREO));
-    PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_FromInt((int)WX_GL_AUX_BUFFERS));
-    PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_FromInt((int)WX_GL_MIN_RED));
-    PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_FromInt((int)WX_GL_MIN_GREEN));
-    PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_FromInt((int)WX_GL_MIN_BLUE));
-    PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_FromInt((int)WX_GL_MIN_ALPHA));
-    PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_FromInt((int)WX_GL_DEPTH_SIZE));
-    PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_FromInt((int)WX_GL_STENCIL_SIZE));
-    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_FromInt((int)WX_GL_MIN_ACCUM_RED));
-    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_FromInt((int)WX_GL_MIN_ACCUM_GREEN));
-    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_FromInt((int)WX_GL_MIN_ACCUM_BLUE));
-    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_FromInt((int)WX_GL_MIN_ACCUM_ALPHA));
+    PyDict_SetItemString(d,"WX_GL_RGBA", SWIG_From_int((int)WX_GL_RGBA));
+    PyDict_SetItemString(d,"WX_GL_BUFFER_SIZE", SWIG_From_int((int)WX_GL_BUFFER_SIZE));
+    PyDict_SetItemString(d,"WX_GL_LEVEL", SWIG_From_int((int)WX_GL_LEVEL));
+    PyDict_SetItemString(d,"WX_GL_DOUBLEBUFFER", SWIG_From_int((int)WX_GL_DOUBLEBUFFER));
+    PyDict_SetItemString(d,"WX_GL_STEREO", SWIG_From_int((int)WX_GL_STEREO));
+    PyDict_SetItemString(d,"WX_GL_AUX_BUFFERS", SWIG_From_int((int)WX_GL_AUX_BUFFERS));
+    PyDict_SetItemString(d,"WX_GL_MIN_RED", SWIG_From_int((int)WX_GL_MIN_RED));
+    PyDict_SetItemString(d,"WX_GL_MIN_GREEN", SWIG_From_int((int)WX_GL_MIN_GREEN));
+    PyDict_SetItemString(d,"WX_GL_MIN_BLUE", SWIG_From_int((int)WX_GL_MIN_BLUE));
+    PyDict_SetItemString(d,"WX_GL_MIN_ALPHA", SWIG_From_int((int)WX_GL_MIN_ALPHA));
+    PyDict_SetItemString(d,"WX_GL_DEPTH_SIZE", SWIG_From_int((int)WX_GL_DEPTH_SIZE));
+    PyDict_SetItemString(d,"WX_GL_STENCIL_SIZE", SWIG_From_int((int)WX_GL_STENCIL_SIZE));
+    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_RED", SWIG_From_int((int)WX_GL_MIN_ACCUM_RED));
+    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_GREEN", SWIG_From_int((int)WX_GL_MIN_ACCUM_GREEN));
+    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_BLUE", SWIG_From_int((int)WX_GL_MIN_ACCUM_BLUE));
+    PyDict_SetItemString(d,"WX_GL_MIN_ACCUM_ALPHA", SWIG_From_int((int)WX_GL_MIN_ACCUM_ALPHA));
     
     
     

diff --git a/wxPython/contrib/ogl/mac/ogl_wrap.cpp b/wxPython/contrib/ogl/mac/ogl_wrap.cpp
index c60c89728c0142b9c7b1e2966888b673e3bac6c8..6d404c09cf9da491d77d58bf225ea56b05b0703d 100644 (file)
--- a/wxPython/contrib/ogl/mac/ogl_wrap.cpp
+++ b/wxPython/contrib/ogl/mac/ogl_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxOGLConstraint swig_types[0] 
@@ -259,47 +261,64 @@ static swig_type_info *swig_types[42];
 
 #define SWIG_name    "_ogl"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -309,117 +328,158 @@ static swig_type_info *swig_types[42];
 
  static const wxString wxPyEmptyString(wxEmptyString); 
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckDouble(PyObject* obj)
+SWIGSTATICINLINE(double)
+SWIG_As_double(PyObject* obj)
 {
-  SWIG_AsDouble(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(double));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
 }
 
 
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -432,29 +492,57 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
+
     WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);
 
 void wxPyShapeEvtHandler__setOORInfo(wxPyShapeEvtHandler *self,PyObject *_self){
             self->SetClientObject(new wxPyOORClientData(_self));
         }
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
@@ -464,21 +552,42 @@ PyObject *wxPyShape_GetChildren(wxPyShape *self){
             wxList& list = self->GetChildren();
             return wxPy_ConvertShapeList(&list);
         }
+
+SWIGSTATICINLINE(PyObject*)
+  SWIG_From_bool(bool value)
+{
+  PyObject *obj = value ? Py_True : Py_False;
+  Py_INCREF(obj);
+  return obj;
+}
+
+
+
 PyObject *wxPyShape_GetLines(wxPyShape *self){
             wxList& list = self->GetLines();
             return wxPy_ConvertShapeList(&list);
         }
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 PyObject *wxPyShape_GetRegions(wxPyShape *self){
@@ -833,7 +942,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPyTextShape, wxTextShape);
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ShapeRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *result;
     char *kwnames[] = {
@@ -855,7 +964,7 @@ static PyObject *_wrap_new_ShapeRegion(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -896,7 +1005,7 @@ static PyObject *_wrap_ShapeRegion_SetText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -945,7 +1054,7 @@ static PyObject *_wrap_ShapeRegion_SetFont(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -960,9 +1069,9 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetMinSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -978,7 +1087,7 @@ static PyObject *_wrap_ShapeRegion_SetMinSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -993,9 +1102,9 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1011,7 +1120,7 @@ static PyObject *_wrap_ShapeRegion_SetSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -1026,9 +1135,9 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1044,7 +1153,7 @@ static PyObject *_wrap_ShapeRegion_SetPosition(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double arg2 ;
@@ -1059,9 +1168,9 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ShapeRegion_SetProportions",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1077,7 +1186,7 @@ static PyObject *_wrap_ShapeRegion_SetProportions(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int arg2 ;
@@ -1090,7 +1199,7 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetFormatMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1106,7 +1215,7 @@ static PyObject *_wrap_ShapeRegion_SetFormatMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -1147,7 +1256,7 @@ static PyObject *_wrap_ShapeRegion_SetName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -1188,7 +1297,7 @@ static PyObject *_wrap_ShapeRegion_SetColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1220,7 +1329,7 @@ static PyObject *_wrap_ShapeRegion_GetText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxFont *result;
@@ -1246,20 +1355,22 @@ static PyObject *_wrap_ShapeRegion_GetFont(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetMinSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1271,34 +1382,32 @@ static PyObject *_wrap_ShapeRegion_GetMinSize(PyObject *self, PyObject *args, Py
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetProportion",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1310,34 +1419,32 @@ static PyObject *_wrap_ShapeRegion_GetProportion(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1349,34 +1456,32 @@ static PyObject *_wrap_ShapeRegion_GetSize(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ShapeRegion_GetPosition",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1388,21 +1493,17 @@ static PyObject *_wrap_ShapeRegion_GetPosition(PyObject *self, PyObject *args, P
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int result;
@@ -1421,14 +1522,14 @@ static PyObject *_wrap_ShapeRegion_GetFormatMode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1460,7 +1561,7 @@ static PyObject *_wrap_ShapeRegion_GetName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1492,7 +1593,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxColour result;
@@ -1522,7 +1623,7 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxList *result;
@@ -1551,7 +1652,7 @@ static PyObject *_wrap_ShapeRegion_GetFormattedText(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString result;
@@ -1583,7 +1684,7 @@ static PyObject *_wrap_ShapeRegion_GetPenColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int result;
@@ -1602,14 +1703,14 @@ static PyObject *_wrap_ShapeRegion_GetPenStyle(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     int arg2 ;
@@ -1622,7 +1723,7 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShapeRegion_SetPenStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1638,7 +1739,7 @@ static PyObject *_wrap_ShapeRegion_SetPenStyle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxString *arg2 = 0 ;
@@ -1679,7 +1780,7 @@ static PyObject *_wrap_ShapeRegion_SetPenColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     wxPen *result;
@@ -1705,7 +1806,7 @@ static PyObject *_wrap_ShapeRegion_GetActualPen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double result;
@@ -1724,14 +1825,14 @@ static PyObject *_wrap_ShapeRegion_GetWidth(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     double result;
@@ -1750,14 +1851,14 @@ static PyObject *_wrap_ShapeRegion_GetHeight(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShapeRegion_ClearText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1782,14 +1883,14 @@ static PyObject *_wrap_ShapeRegion_ClearText(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * ShapeRegion_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ShapeRegion_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxShapeRegion, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AttachmentPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     double arg2 = (double) 0.0 ;
@@ -1804,15 +1905,15 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AttachmentPoint",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (double) SWIG_AsDouble(obj2); 
+        arg3 = (double)SWIG_As_double(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1829,7 +1930,7 @@ static PyObject *_wrap_new_AttachmentPoint(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     int arg2 ;
@@ -1842,7 +1943,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_id_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_id = arg2;
     
@@ -1853,7 +1954,7 @@ static PyObject *_wrap_AttachmentPoint_m_id_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     int result;
@@ -1867,14 +1968,14 @@ static PyObject *_wrap_AttachmentPoint_m_id_get(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_id);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double arg2 ;
@@ -1887,7 +1988,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_x = arg2;
     
@@ -1898,7 +1999,7 @@ static PyObject *_wrap_AttachmentPoint_m_x_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double result;
@@ -1912,14 +2013,14 @@ static PyObject *_wrap_AttachmentPoint_m_x_get(PyObject *self, PyObject *args, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (double) ((arg1)->m_x);
     
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double arg2 ;
@@ -1932,7 +2033,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AttachmentPoint_m_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAttachmentPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_y = arg2;
     
@@ -1943,7 +2044,7 @@ static PyObject *_wrap_AttachmentPoint_m_y_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAttachmentPoint *arg1 = (wxAttachmentPoint *) 0 ;
     double result;
@@ -1957,21 +2058,21 @@ static PyObject *_wrap_AttachmentPoint_m_y_get(PyObject *self, PyObject *args, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (double) ((arg1)->m_y);
     
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * AttachmentPoint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * AttachmentPoint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxAttachmentPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) NULL ;
     wxPyShape *arg2 = (wxPyShape *) NULL ;
@@ -2005,7 +2106,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2036,7 +2137,7 @@ static PyObject *_wrap_PyShapeEvtHandler__setCallbackInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2064,7 +2165,7 @@ static PyObject *_wrap_PyShapeEvtHandler__setOORInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -2093,7 +2194,7 @@ static PyObject *_wrap_PyShapeEvtHandler_SetShape(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShape *result;
@@ -2121,7 +2222,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetShape(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *arg2 = (wxPyShapeEvtHandler *) 0 ;
@@ -2150,7 +2251,7 @@ static PyObject *_wrap_PyShapeEvtHandler_SetPreviousHandler(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -2178,7 +2279,7 @@ static PyObject *_wrap_PyShapeEvtHandler_GetPreviousHandler(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -2206,7 +2307,7 @@ static PyObject *_wrap_PyShapeEvtHandler_CreateNewCopy(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2231,7 +2332,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDelete(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2265,7 +2366,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDraw(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2299,7 +2400,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawContents(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2322,7 +2423,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2339,7 +2440,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawBranches(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2373,7 +2474,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLinks(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2407,7 +2508,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnErase(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2441,7 +2542,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseContents(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2475,7 +2576,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnHighlight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2494,16 +2595,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2520,7 +2621,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2539,16 +2640,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2565,7 +2666,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnLeftDoubleClick(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2584,16 +2685,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2610,7 +2711,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnRightClick(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2625,9 +2726,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2643,7 +2744,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2674,16 +2775,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2702,7 +2803,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePre(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2732,16 +2833,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2758,7 +2859,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMovePost(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     bool arg2 ;
@@ -2779,18 +2880,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2807,7 +2908,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2826,16 +2927,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2852,7 +2953,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2871,16 +2972,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2897,7 +2998,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     bool arg2 ;
@@ -2918,18 +3019,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShapeEvtHandler_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2946,7 +3047,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -2965,16 +3066,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2991,7 +3092,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginDragRight(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3010,16 +3111,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeEvtHandler_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3036,7 +3137,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndDragRight(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3064,13 +3165,13 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3086,7 +3187,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawOutline(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3120,7 +3221,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnDrawControlPoints(PyObject *self
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3154,7 +3255,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEraseControlPoints(PyObject *sel
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxDC *arg2 = 0 ;
@@ -3177,7 +3278,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3194,7 +3295,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnMoveLink(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3219,18 +3320,18 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3247,7 +3348,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3270,16 +3371,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3296,7 +3397,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft(PyObject *se
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -3319,16 +3420,16 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3345,7 +3446,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft(PyObject *self
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3360,9 +3461,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3378,7 +3479,7 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnBeginSize(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeEvtHandler *arg1 = (wxPyShapeEvtHandler *) 0 ;
     double arg2 ;
@@ -3393,9 +3494,9 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShapeEvtHandler_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3411,14 +3512,14 @@ static PyObject *_wrap_PyShapeEvtHandler_base_OnEndSize(PyObject *self, PyObject
 }
 
 
-static PyObject * PyShapeEvtHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyShapeEvtHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyShapeEvtHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) NULL ;
     wxPyShape *result;
@@ -3446,7 +3547,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -3477,20 +3578,22 @@ static PyObject *_wrap_PyShape__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMax",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -3502,34 +3605,32 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMax(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetBoundingBoxMin",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -3541,21 +3642,17 @@ static PyObject *_wrap_PyShape_GetBoundingBoxMin(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3566,7 +3663,9 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
     double *arg7 = (double *) 0 ;
     bool result;
     double temp6 ;
+    int res6 = 0 ;
     double temp7 ;
+    int res7 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -3576,18 +3675,18 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
         (char *) "self",(char *) "x1",(char *) "y1",(char *) "x2",(char *) "y2", NULL 
     };
     
-    arg6 = &temp6;
-    arg7 = &temp7;
+    arg6 = &temp6; res6 = SWIG_NEWOBJ;
+    arg7 = &temp7; res7 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetPerimeterPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3599,21 +3698,17 @@ static PyObject *_wrap_PyShape_GetPerimeterPoint(PyObject *self, PyObject *args,
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg6));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg7));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res6 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg6)) : SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res7 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg7)) : SWIG_NewPointerObj((void*)(arg7), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *result;
@@ -3641,7 +3736,7 @@ static PyObject *_wrap_PyShape_GetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3670,7 +3765,7 @@ static PyObject *_wrap_PyShape_SetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddToCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3705,7 +3800,7 @@ static PyObject *_wrap_PyShape_AddToCanvas(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3734,7 +3829,7 @@ static PyObject *_wrap_PyShape_InsertInCanvas(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -3763,7 +3858,7 @@ static PyObject *_wrap_PyShape_RemoveFromCanvas(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -3782,14 +3877,14 @@ static PyObject *_wrap_PyShape_GetX(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -3808,14 +3903,14 @@ static PyObject *_wrap_PyShape_GetY(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3828,7 +3923,7 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3844,7 +3939,7 @@ static PyObject *_wrap_PyShape_SetX(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -3857,7 +3952,7 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3873,7 +3968,7 @@ static PyObject *_wrap_PyShape_SetY(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *result;
@@ -3901,7 +3996,7 @@ static PyObject *_wrap_PyShape_GetParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -3930,7 +4025,7 @@ static PyObject *_wrap_PyShape_SetParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *result;
@@ -3958,7 +4053,7 @@ static PyObject *_wrap_PyShape_GetTopAncestor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -3984,7 +4079,7 @@ static PyObject *_wrap_PyShape_GetChildren(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Unlink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4009,7 +4104,7 @@ static PyObject *_wrap_PyShape_Unlink(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4022,7 +4117,7 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDrawHandles",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4038,7 +4133,7 @@ static PyObject *_wrap_PyShape_SetDrawHandles(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4066,7 +4161,7 @@ static PyObject *_wrap_PyShape_GetDrawHandles(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4091,7 +4186,7 @@ static PyObject *_wrap_PyShape_MakeControlPoints(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = (wxDC *) NULL ;
@@ -4122,7 +4217,7 @@ static PyObject *_wrap_PyShape_DeleteControlPoints(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4147,7 +4242,7 @@ static PyObject *_wrap_PyShape_ResetControlPoints(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeEvtHandler *result;
@@ -4175,7 +4270,7 @@ static PyObject *_wrap_PyShape_GetEventHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeEvtHandler *arg2 = (wxPyShapeEvtHandler *) 0 ;
@@ -4204,7 +4299,7 @@ static PyObject *_wrap_PyShape_SetEventHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4229,7 +4324,7 @@ static PyObject *_wrap_PyShape_MakeMandatoryControlPoints(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4254,7 +4349,7 @@ static PyObject *_wrap_PyShape_ResetMandatoryControlPoints(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Recompute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4282,7 +4377,7 @@ static PyObject *_wrap_PyShape_Recompute(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4307,7 +4402,7 @@ static PyObject *_wrap_PyShape_CalculateSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 = (bool) True ;
@@ -4323,7 +4418,7 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -4344,7 +4439,7 @@ static PyObject *_wrap_PyShape_Select(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 = (bool) True ;
@@ -4360,11 +4455,11 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4381,7 +4476,7 @@ static PyObject *_wrap_PyShape_SetHighlight(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_IsHighlighted(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4409,7 +4504,7 @@ static PyObject *_wrap_PyShape_IsHighlighted(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Selected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4437,7 +4532,7 @@ static PyObject *_wrap_PyShape_Selected(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AncestorSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4465,7 +4560,7 @@ static PyObject *_wrap_PyShape_AncestorSelected(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) OP_ALL ;
@@ -4481,11 +4576,11 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4502,7 +4597,7 @@ static PyObject *_wrap_PyShape_SetSensitivityFilter(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -4521,14 +4616,14 @@ static PyObject *_wrap_PyShape_GetSensitivityFilter(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDraggable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4543,10 +4638,10 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetDraggable",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4563,7 +4658,7 @@ static PyObject *_wrap_PyShape_SetDraggable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFixedSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4578,9 +4673,9 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetFixedSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4596,20 +4691,22 @@ static PyObject *_wrap_PyShape_SetFixedSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool *arg2 = (bool *) 0 ;
     bool *arg3 = (bool *) 0 ;
     bool temp2 ;
+    int res2 = 0 ;
     bool temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyShape_GetFixedSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -4621,21 +4718,17 @@ static PyObject *_wrap_PyShape_GetFixedSize(PyObject *self, PyObject *args, PyOb
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_bool((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_bool, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_bool((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_bool, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4663,7 +4756,7 @@ static PyObject *_wrap_PyShape_GetFixedWidth(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4691,7 +4784,7 @@ static PyObject *_wrap_PyShape_GetFixedHeight(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4704,7 +4797,7 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetSpaceAttachments",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4720,7 +4813,7 @@ static PyObject *_wrap_PyShape_SetSpaceAttachments(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4748,7 +4841,7 @@ static PyObject *_wrap_PyShape_GetSpaceAttachments(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetShadowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -4763,10 +4856,10 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetShadowMode",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4783,7 +4876,7 @@ static PyObject *_wrap_PyShape_SetShadowMode(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetShadowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -4802,14 +4895,14 @@ static PyObject *_wrap_PyShape_GetShadowMode(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -4818,7 +4911,9 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
     double *arg5 = (double *) 0 ;
     bool result;
     int temp4 ;
+    int res4 = 0 ;
     double temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -4826,14 +4921,14 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
         (char *) "self",(char *) "x",(char *) "y", NULL 
     };
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_HitTest",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4845,21 +4940,17 @@ static PyObject *_wrap_PyShape_HitTest(PyObject *self, PyObject *args, PyObject
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetCentreResize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4872,7 +4963,7 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetCentreResize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4888,7 +4979,7 @@ static PyObject *_wrap_PyShape_SetCentreResize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetCentreResize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4916,7 +5007,7 @@ static PyObject *_wrap_PyShape_GetCentreResize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -4929,7 +5020,7 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetMaintainAspectRatio",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4945,7 +5036,7 @@ static PyObject *_wrap_PyShape_SetMaintainAspectRatio(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -4973,7 +5064,7 @@ static PyObject *_wrap_PyShape_GetMaintainAspectRatio(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -4999,7 +5090,7 @@ static PyObject *_wrap_PyShape_GetLines(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -5012,7 +5103,7 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetDisableLabel",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5028,7 +5119,7 @@ static PyObject *_wrap_PyShape_SetDisableLabel(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5056,7 +5147,7 @@ static PyObject *_wrap_PyShape_GetDisableLabel(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -5069,7 +5160,7 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetAttachmentMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5085,7 +5176,7 @@ static PyObject *_wrap_PyShape_SetAttachmentMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -5104,14 +5195,14 @@ static PyObject *_wrap_PyShape_GetAttachmentMode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long arg2 ;
@@ -5124,7 +5215,7 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5140,7 +5231,7 @@ static PyObject *_wrap_PyShape_SetId(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long result;
@@ -5159,14 +5250,14 @@ static PyObject *_wrap_PyShape_GetId(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -5211,7 +5302,7 @@ static PyObject *_wrap_PyShape_SetPen(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -5254,7 +5345,7 @@ static PyObject *_wrap_PyShape_SetBrush(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -5267,7 +5358,7 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_Show",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5283,7 +5374,7 @@ static PyObject *_wrap_PyShape_Show(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5311,7 +5402,7 @@ static PyObject *_wrap_PyShape_IsShown(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Move(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5337,12 +5428,12 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (bool) SWIG_AsBool(obj4); 
+        arg5 = (bool)SWIG_As_bool(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5359,7 +5450,7 @@ static PyObject *_wrap_PyShape_Move(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Erase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5393,7 +5484,7 @@ static PyObject *_wrap_PyShape_Erase(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_EraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5427,7 +5518,7 @@ static PyObject *_wrap_PyShape_EraseContents(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5461,7 +5552,7 @@ static PyObject *_wrap_PyShape_Draw(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Flash(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5486,7 +5577,7 @@ static PyObject *_wrap_PyShape_Flash(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5520,7 +5611,7 @@ static PyObject *_wrap_PyShape_MoveLinks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5554,7 +5645,7 @@ static PyObject *_wrap_PyShape_DrawContents(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -5571,12 +5662,12 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShape_SetSize",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5593,7 +5684,7 @@ static PyObject *_wrap_PyShape_SetSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -5608,9 +5699,9 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_SetAttachmentSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5626,7 +5717,7 @@ static PyObject *_wrap_PyShape_SetAttachmentSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -5655,7 +5746,7 @@ static PyObject *_wrap_PyShape_Attach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5680,7 +5771,7 @@ static PyObject *_wrap_PyShape_Detach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Constrain(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -5708,7 +5799,7 @@ static PyObject *_wrap_PyShape_Constrain(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -5736,19 +5827,19 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5765,7 +5856,7 @@ static PyObject *_wrap_PyShape_AddLine(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetLinePosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -5788,14 +5879,14 @@ static PyObject *_wrap_PyShape_GetLinePosition(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -5836,7 +5927,7 @@ static PyObject *_wrap_PyShape_AddText(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen *result;
@@ -5862,7 +5953,7 @@ static PyObject *_wrap_PyShape_GetPen(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush *result;
@@ -5888,7 +5979,7 @@ static PyObject *_wrap_PyShape_GetBrush(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5913,7 +6004,7 @@ static PyObject *_wrap_PyShape_SetDefaultRegionSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FormatText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -5944,7 +6035,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5969,7 +6060,7 @@ static PyObject *_wrap_PyShape_FormatText(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -5984,10 +6075,10 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyShape_SetFormatMode",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6004,7 +6095,7 @@ static PyObject *_wrap_PyShape_SetFormatMode(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFormatMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6019,7 +6110,7 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6029,14 +6120,14 @@ static PyObject *_wrap_PyShape_GetFormatMode(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -6074,7 +6165,7 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
         arg2 = NULL;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6091,7 +6182,7 @@ static PyObject *_wrap_PyShape_SetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6106,7 +6197,7 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6123,7 +6214,7 @@ static PyObject *_wrap_PyShape_GetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6145,7 +6236,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6170,7 +6261,7 @@ static PyObject *_wrap_PyShape_SetTextColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6185,7 +6276,7 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6208,7 +6299,7 @@ static PyObject *_wrap_PyShape_GetTextColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -6227,14 +6318,14 @@ static PyObject *_wrap_PyShape_GetNumberOfTextRegions(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetRegionName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6256,7 +6347,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6281,7 +6372,7 @@ static PyObject *_wrap_PyShape_SetRegionName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegionName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6295,7 +6386,7 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetRegionName",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6317,7 +6408,7 @@ static PyObject *_wrap_PyShape_GetRegionName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegionId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6344,7 +6435,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -6359,7 +6450,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_NameRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -6403,7 +6494,7 @@ static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -6429,7 +6520,7 @@ static PyObject *_wrap_PyShape_GetRegions(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AddRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxShapeRegion *arg2 = (wxShapeRegion *) 0 ;
@@ -6458,7 +6549,7 @@ static PyObject *_wrap_PyShape_AddRegion(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6483,7 +6574,7 @@ static PyObject *_wrap_PyShape_ClearRegions(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AssignNewIds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6508,7 +6599,7 @@ static PyObject *_wrap_PyShape_AssignNewIds(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FindRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -6516,13 +6607,14 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
     wxPyShape *result;
     bool temp2 = False ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "regionName", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_FindRegion",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -6541,10 +6633,8 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
     {
         resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -6559,7 +6649,7 @@ static PyObject *_wrap_PyShape_FindRegion(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_FindRegionNames(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxStringList *arg2 = 0 ;
@@ -6593,7 +6683,7 @@ static PyObject *_wrap_PyShape_FindRegionNames(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -6607,7 +6697,7 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6624,7 +6714,7 @@ static PyObject *_wrap_PyShape_ClearText(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_RemoveLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyLineShape *arg2 = (wxPyLineShape *) 0 ;
@@ -6653,7 +6743,7 @@ static PyObject *_wrap_PyShape_RemoveLine(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6664,7 +6754,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
     wxPyLineShape *arg7 = (wxPyLineShape *) NULL ;
     bool result;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6674,19 +6766,19 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
         (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPosition",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg5 = (int) SWIG_AsInt(obj2); 
+        arg5 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg6 = (int) SWIG_AsInt(obj3); 
+        arg6 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -6703,21 +6795,17 @@ static PyObject *_wrap_PyShape_GetAttachmentPosition(PyObject *self, PyObject *a
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -6736,14 +6824,14 @@ static PyObject *_wrap_PyShape_GetNumberOfAttachments(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6757,7 +6845,7 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_AttachmentIsValid",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6775,7 +6863,7 @@ static PyObject *_wrap_PyShape_AttachmentIsValid(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *result;
@@ -6801,7 +6889,7 @@ static PyObject *_wrap_PyShape_GetAttachments(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6812,7 +6900,9 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
     wxPyLineShape *arg7 = (wxPyLineShape *) NULL ;
     bool result;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -6822,19 +6912,19 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
         (char *) "self",(char *) "attachment",(char *) "nth",(char *) "no_arcs",(char *) "line", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:PyShape_GetAttachmentPositionEdge",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg5 = (int) SWIG_AsInt(obj2); 
+        arg5 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg6 = (int) SWIG_AsInt(obj3); 
+        arg6 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -6851,21 +6941,17 @@ static PyObject *_wrap_PyShape_GetAttachmentPositionEdge(PyObject *self, PyObjec
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -6897,9 +6983,9 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
         arg3 = &temp3;
         if ( ! wxRealPoint_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -6921,7 +7007,7 @@ static PyObject *_wrap_PyShape_CalcSimpleAttachment(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -6941,7 +7027,7 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_AttachmentSortTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -6967,7 +7053,7 @@ static PyObject *_wrap_PyShape_AttachmentSortTest(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_EraseLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -6992,11 +7078,11 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7013,7 +7099,7 @@ static PyObject *_wrap_PyShape_EraseLinks(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_DrawLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7038,11 +7124,11 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7059,7 +7145,7 @@ static PyObject *_wrap_PyShape_DrawLinks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7088,9 +7174,9 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject
     }
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7108,7 +7194,7 @@ static PyObject *_wrap_PyShape_MoveLineToNewAttachment(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -7136,7 +7222,7 @@ static PyObject *_wrap_PyShape_ApplyAttachmentOrdering(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7150,7 +7236,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetBranchingAttachmentRoot",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7170,7 +7256,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentRoot(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7196,7 +7282,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:PyShape_GetBranchingAttachmentInfo",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -7230,7 +7316,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7252,9 +7338,9 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyShape_GetBranchingAttachmentPoint",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = &temp4;
@@ -7280,7 +7366,7 @@ static PyObject *_wrap_PyShape_GetBranchingAttachmentPoint(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7294,7 +7380,7 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_GetAttachmentLineCount",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7303,14 +7389,14 @@ static PyObject *_wrap_PyShape_GetAttachmentLineCount(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7323,7 +7409,7 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchNeckLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7339,7 +7425,7 @@ static PyObject *_wrap_PyShape_SetBranchNeckLength(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7358,14 +7444,14 @@ static PyObject *_wrap_PyShape_GetBranchNeckLength(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7378,7 +7464,7 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStemLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7394,7 +7480,7 @@ static PyObject *_wrap_PyShape_SetBranchStemLength(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7413,14 +7499,14 @@ static PyObject *_wrap_PyShape_GetBranchStemLength(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7433,7 +7519,7 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchSpacing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7449,7 +7535,7 @@ static PyObject *_wrap_PyShape_SetBranchSpacing(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int result;
@@ -7468,14 +7554,14 @@ static PyObject *_wrap_PyShape_GetBranchSpacing(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long arg2 ;
@@ -7488,7 +7574,7 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetBranchStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7504,7 +7590,7 @@ static PyObject *_wrap_PyShape_SetBranchStyle(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     long result;
@@ -7523,14 +7609,14 @@ static PyObject *_wrap_PyShape_GetBranchStyle(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7544,7 +7630,7 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_PhysicalToLogicalAttachment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7553,14 +7639,14 @@ static PyObject *_wrap_PyShape_PhysicalToLogicalAttachment(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     int arg2 ;
@@ -7574,7 +7660,7 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_LogicalToPhysicalAttachment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7583,14 +7669,14 @@ static PyObject *_wrap_PyShape_LogicalToPhysicalAttachment(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Draggable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool result;
@@ -7618,7 +7704,7 @@ static PyObject *_wrap_PyShape_Draggable(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_HasDescendant(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -7650,7 +7736,7 @@ static PyObject *_wrap_PyShape_HasDescendant(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 = (bool) True ;
@@ -7667,11 +7753,11 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7690,7 +7776,7 @@ static PyObject *_wrap_PyShape_CreateNewCopy(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = 0 ;
@@ -7724,7 +7810,7 @@ static PyObject *_wrap_PyShape_Copy(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyShape *arg2 = 0 ;
@@ -7758,7 +7844,7 @@ static PyObject *_wrap_PyShape_CopyWithHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -7775,11 +7861,11 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7795,7 +7881,7 @@ static PyObject *_wrap_PyShape_Rotate(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double result;
@@ -7814,14 +7900,14 @@ static PyObject *_wrap_PyShape_GetRotation(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_SetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -7834,7 +7920,7 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyShape_SetRotation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7850,7 +7936,7 @@ static PyObject *_wrap_PyShape_SetRotation(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7875,7 +7961,7 @@ static PyObject *_wrap_PyShape_ClearAttachments(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_Recentre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -7909,7 +7995,7 @@ static PyObject *_wrap_PyShape_Recentre(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_ClearPointList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxList *arg2 = 0 ;
@@ -7943,7 +8029,7 @@ static PyObject *_wrap_PyShape_ClearPointList(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPen result;
@@ -7973,7 +8059,7 @@ static PyObject *_wrap_PyShape_GetBackgroundPen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxBrush result;
@@ -8003,7 +8089,7 @@ static PyObject *_wrap_PyShape_GetBackgroundBrush(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8028,7 +8114,7 @@ static PyObject *_wrap_PyShape_base_OnDelete(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8062,7 +8148,7 @@ static PyObject *_wrap_PyShape_base_OnDraw(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8096,7 +8182,7 @@ static PyObject *_wrap_PyShape_base_OnDrawContents(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8119,7 +8205,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8136,7 +8222,7 @@ static PyObject *_wrap_PyShape_base_OnDrawBranches(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8170,7 +8256,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLinks(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8204,7 +8290,7 @@ static PyObject *_wrap_PyShape_base_OnErase(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8238,7 +8324,7 @@ static PyObject *_wrap_PyShape_base_OnEraseContents(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8272,7 +8358,7 @@ static PyObject *_wrap_PyShape_base_OnHighlight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8291,16 +8377,16 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8317,7 +8403,7 @@ static PyObject *_wrap_PyShape_base_OnLeftClick(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8336,16 +8422,16 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8362,7 +8448,7 @@ static PyObject *_wrap_PyShape_base_OnLeftDoubleClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8381,16 +8467,16 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8407,7 +8493,7 @@ static PyObject *_wrap_PyShape_base_OnRightClick(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8422,9 +8508,9 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8440,7 +8526,7 @@ static PyObject *_wrap_PyShape_base_OnSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8471,16 +8557,16 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8499,7 +8585,7 @@ static PyObject *_wrap_PyShape_base_OnMovePre(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8529,16 +8615,16 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8555,7 +8641,7 @@ static PyObject *_wrap_PyShape_base_OnMovePost(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -8576,18 +8662,18 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8604,7 +8690,7 @@ static PyObject *_wrap_PyShape_base_OnDragLeft(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8623,16 +8709,16 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8649,7 +8735,7 @@ static PyObject *_wrap_PyShape_base_OnBeginDragLeft(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8668,16 +8754,16 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8694,7 +8780,7 @@ static PyObject *_wrap_PyShape_base_OnEndDragLeft(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     bool arg2 ;
@@ -8715,18 +8801,18 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8743,7 +8829,7 @@ static PyObject *_wrap_PyShape_base_OnDragRight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8762,16 +8848,16 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8788,7 +8874,7 @@ static PyObject *_wrap_PyShape_base_OnBeginDragRight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -8807,16 +8893,16 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8833,7 +8919,7 @@ static PyObject *_wrap_PyShape_base_OnEndDragRight(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8861,13 +8947,13 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8883,7 +8969,7 @@ static PyObject *_wrap_PyShape_base_OnDrawOutline(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8917,7 +9003,7 @@ static PyObject *_wrap_PyShape_base_OnDrawControlPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8951,7 +9037,7 @@ static PyObject *_wrap_PyShape_base_OnEraseControlPoints(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8974,7 +9060,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8991,7 +9077,7 @@ static PyObject *_wrap_PyShape_base_OnMoveLink(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9016,18 +9102,18 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9044,7 +9130,7 @@ static PyObject *_wrap_PyShape_base_OnSizingDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9067,16 +9153,16 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9093,7 +9179,7 @@ static PyObject *_wrap_PyShape_base_OnSizingBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -9116,16 +9202,16 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9142,7 +9228,7 @@ static PyObject *_wrap_PyShape_base_OnSizingEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -9157,9 +9243,9 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9175,7 +9261,7 @@ static PyObject *_wrap_PyShape_base_OnBeginSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShape *arg1 = (wxPyShape *) 0 ;
     double arg2 ;
@@ -9190,9 +9276,9 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9208,14 +9294,14 @@ static PyObject *_wrap_PyShape_base_OnEndSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * PyShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PseudoMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PseudoMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *result;
     char *kwnames[] = {
@@ -9239,7 +9325,7 @@ static PyObject *_wrap_new_PseudoMetaFile(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PseudoMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9264,7 +9350,7 @@ static PyObject *_wrap_delete_PseudoMetaFile(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxDC *arg2 = 0 ;
@@ -9288,9 +9374,9 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9306,7 +9392,7 @@ static PyObject *_wrap_PseudoMetaFile_Draw(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9331,7 +9417,7 @@ static PyObject *_wrap_PseudoMetaFile_Clear(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPseudoMetaFile *arg2 = 0 ;
@@ -9365,7 +9451,7 @@ static PyObject *_wrap_PseudoMetaFile_Copy(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9380,9 +9466,9 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9398,7 +9484,7 @@ static PyObject *_wrap_PseudoMetaFile_Scale(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9413,9 +9499,9 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_ScaleTo",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9431,7 +9517,7 @@ static PyObject *_wrap_PseudoMetaFile_ScaleTo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9446,9 +9532,9 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9464,7 +9550,7 @@ static PyObject *_wrap_PseudoMetaFile_Translate(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9481,11 +9567,11 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PseudoMetaFile_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9501,7 +9587,7 @@ static PyObject *_wrap_PseudoMetaFile_Rotate(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
@@ -9553,7 +9639,7 @@ static PyObject *_wrap_PseudoMetaFile_LoadFromMetaFile(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -9594,7 +9680,7 @@ static PyObject *_wrap_PseudoMetaFile_GetBounds(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPyDrawnShape *arg2 = (wxPyDrawnShape *) 0 ;
@@ -9623,7 +9709,7 @@ static PyObject *_wrap_PseudoMetaFile_CalculateSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool arg2 ;
@@ -9636,7 +9722,7 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetRotateable",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9652,7 +9738,7 @@ static PyObject *_wrap_PseudoMetaFile_SetRotateable(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool result;
@@ -9680,7 +9766,7 @@ static PyObject *_wrap_PseudoMetaFile_GetRotateable(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     double arg2 ;
@@ -9695,9 +9781,9 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PseudoMetaFile_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9713,7 +9799,7 @@ static PyObject *_wrap_PseudoMetaFile_SetSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -9756,7 +9842,7 @@ static PyObject *_wrap_PseudoMetaFile_SetFillBrush(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *result;
@@ -9782,7 +9868,7 @@ static PyObject *_wrap_PseudoMetaFile_GetFillBrush(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -9827,7 +9913,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlinePen(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *result;
@@ -9853,7 +9939,7 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlinePen(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -9866,7 +9952,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetOutlineOp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9882,7 +9968,7 @@ static PyObject *_wrap_PseudoMetaFile_SetOutlineOp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int result;
@@ -9901,14 +9987,14 @@ static PyObject *_wrap_PseudoMetaFile_GetOutlineOp(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     bool result;
@@ -9936,7 +10022,7 @@ static PyObject *_wrap_PseudoMetaFile_IsValid(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -9975,7 +10061,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawLine(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10007,7 +10093,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRectangle(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10027,7 +10113,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10043,7 +10129,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawRoundedRectangle(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10089,7 +10175,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawArc(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10111,9 +10197,9 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10129,7 +10215,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipticArc(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10161,7 +10247,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawEllipse(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10193,7 +10279,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawPoint(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxString *arg2 = 0 ;
@@ -10241,7 +10327,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10279,7 +10365,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawLines(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10300,7 +10386,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args
         if (arg3 == NULL) SWIG_fail;
     }
     if (obj2) {
-        arg4 = (int) SWIG_AsInt(obj2); 
+        arg4 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10323,7 +10409,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawPolygon(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10361,7 +10447,7 @@ static PyObject *_wrap_PseudoMetaFile_DrawSpline(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10393,7 +10479,7 @@ static PyObject *_wrap_PseudoMetaFile_SetClippingRect(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10418,7 +10504,7 @@ static PyObject *_wrap_PseudoMetaFile_DestroyClippingRect(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -10452,7 +10538,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
         arg2 = NULL;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10469,7 +10555,7 @@ static PyObject *_wrap_PseudoMetaFile_SetPen(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -10501,7 +10587,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
         arg2 = NULL;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10518,7 +10604,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBrush(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -10567,7 +10653,7 @@ static PyObject *_wrap_PseudoMetaFile_SetFont(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10599,7 +10685,7 @@ static PyObject *_wrap_PseudoMetaFile_SetTextColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10631,7 +10717,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundColour(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPseudoMetaFile *arg1 = (wxPseudoMetaFile *) 0 ;
     int arg2 ;
@@ -10644,7 +10730,7 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PseudoMetaFile_SetBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPseudoMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10660,14 +10746,14 @@ static PyObject *_wrap_PseudoMetaFile_SetBackgroundMode(PyObject *self, PyObject
 }
 
 
-static PyObject * PseudoMetaFile_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PseudoMetaFile_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPseudoMetaFile, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyRectangleShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -10680,11 +10766,11 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyRectangleShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10701,7 +10787,7 @@ static PyObject *_wrap_new_PyRectangleShape(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10732,7 +10818,7 @@ static PyObject *_wrap_PyRectangleShape__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -10745,7 +10831,7 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyRectangleShape_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10761,7 +10847,7 @@ static PyObject *_wrap_PyRectangleShape_SetCornerRadius(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double result;
@@ -10780,14 +10866,14 @@ static PyObject *_wrap_PyRectangleShape_GetCornerRadius(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10812,7 +10898,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDelete(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10846,7 +10932,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDraw(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10880,7 +10966,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawContents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10903,7 +10989,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10920,7 +11006,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawBranches(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10954,7 +11040,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLinks(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -10988,7 +11074,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnErase(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11022,7 +11108,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseContents(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11056,7 +11142,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnHighlight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11075,16 +11161,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11101,7 +11187,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftClick(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11120,16 +11206,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11146,7 +11232,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnLeftDoubleClick(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11165,16 +11251,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11191,7 +11277,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnRightClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11206,9 +11292,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11224,7 +11310,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11255,16 +11341,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11283,7 +11369,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePre(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11313,16 +11399,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11339,7 +11425,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMovePost(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     bool arg2 ;
@@ -11360,18 +11446,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11388,7 +11474,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11407,16 +11493,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11433,7 +11519,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11452,16 +11538,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11478,7 +11564,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     bool arg2 ;
@@ -11499,18 +11585,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyRectangleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11527,7 +11613,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11546,16 +11632,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11572,7 +11658,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginDragRight(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11591,16 +11677,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyRectangleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11617,7 +11703,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11645,13 +11731,13 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11667,7 +11753,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawOutline(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11701,7 +11787,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnDrawControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11735,7 +11821,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnEraseControlPoints(PyObject *self
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -11758,7 +11844,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11775,7 +11861,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnMoveLink(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11800,18 +11886,18 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11828,7 +11914,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11851,16 +11937,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11877,7 +11963,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingBeginDragLeft(PyObject *sel
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -11900,16 +11986,16 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11926,7 +12012,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnSizingEndDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11941,9 +12027,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11959,7 +12045,7 @@ static PyObject *_wrap_PyRectangleShape_base_OnBeginSize(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyRectangleShape *arg1 = (wxPyRectangleShape *) 0 ;
     double arg2 ;
@@ -11974,9 +12060,9 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyRectangleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyRectangleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11992,14 +12078,14 @@ static PyObject *_wrap_PyRectangleShape_base_OnEndSize(PyObject *self, PyObject
 }
 
 
-static PyObject * PyRectangleShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyRectangleShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyRectangleShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) NULL ;
     wxPyShape *arg2 = (wxPyShape *) NULL ;
@@ -12028,19 +12114,19 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (double) SWIG_AsDouble(obj2); 
+        arg3 = (double)SWIG_As_double(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (double) SWIG_AsDouble(obj3); 
+        arg4 = (double)SWIG_As_double(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (double) SWIG_AsDouble(obj4); 
+        arg5 = (double)SWIG_As_double(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12057,7 +12143,7 @@ static PyObject *_wrap_new_PyControlPoint(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -12088,7 +12174,7 @@ static PyObject *_wrap_PyControlPoint__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12101,7 +12187,7 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyControlPoint_SetCornerRadius",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12117,7 +12203,7 @@ static PyObject *_wrap_PyControlPoint_SetCornerRadius(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12142,7 +12228,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDelete(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12176,7 +12262,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12210,7 +12296,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12233,7 +12319,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12250,7 +12336,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12284,7 +12370,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12318,7 +12404,7 @@ static PyObject *_wrap_PyControlPoint_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12352,7 +12438,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12386,7 +12472,7 @@ static PyObject *_wrap_PyControlPoint_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12405,16 +12491,16 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12431,7 +12517,7 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12450,16 +12536,16 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12476,7 +12562,7 @@ static PyObject *_wrap_PyControlPoint_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12495,16 +12581,16 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12521,7 +12607,7 @@ static PyObject *_wrap_PyControlPoint_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12536,9 +12622,9 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12554,7 +12640,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12585,16 +12671,16 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12613,7 +12699,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePre(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12643,16 +12729,16 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12669,7 +12755,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     bool arg2 ;
@@ -12690,18 +12776,18 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12718,7 +12804,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12737,16 +12823,16 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12763,7 +12849,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12782,16 +12868,16 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12808,7 +12894,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     bool arg2 ;
@@ -12829,18 +12915,18 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyControlPoint_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12857,7 +12943,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12876,16 +12962,16 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12902,7 +12988,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -12921,16 +13007,16 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyControlPoint_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12947,7 +13033,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -12975,13 +13061,13 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12997,7 +13083,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13031,7 +13117,7 @@ static PyObject *_wrap_PyControlPoint_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13065,7 +13151,7 @@ static PyObject *_wrap_PyControlPoint_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13088,7 +13174,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13105,7 +13191,7 @@ static PyObject *_wrap_PyControlPoint_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13130,18 +13216,18 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13158,7 +13244,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13181,16 +13267,16 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13207,7 +13293,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -13230,16 +13316,16 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13256,7 +13342,7 @@ static PyObject *_wrap_PyControlPoint_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -13271,9 +13357,9 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13289,7 +13375,7 @@ static PyObject *_wrap_PyControlPoint_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControlPoint *arg1 = (wxPyControlPoint *) 0 ;
     double arg2 ;
@@ -13304,9 +13390,9 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControlPoint_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13322,14 +13408,14 @@ static PyObject *_wrap_PyControlPoint_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyControlPoint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyControlPoint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyControlPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyBitmapShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *result;
     char *kwnames[] = {
@@ -13351,7 +13437,7 @@ static PyObject *_wrap_new_PyBitmapShape(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -13382,7 +13468,7 @@ static PyObject *_wrap_PyBitmapShape__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxBitmap *result;
@@ -13414,7 +13500,7 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString result;
@@ -13446,7 +13532,7 @@ static PyObject *_wrap_PyBitmapShape_GetFilename(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -13480,7 +13566,7 @@ static PyObject *_wrap_PyBitmapShape_SetBitmap(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -13521,7 +13607,7 @@ static PyObject *_wrap_PyBitmapShape_SetFilename(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13546,7 +13632,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDelete(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13580,7 +13666,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDraw(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13614,7 +13700,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawContents(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13637,7 +13723,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13654,7 +13740,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawBranches(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13688,7 +13774,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLinks(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13722,7 +13808,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnErase(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13756,7 +13842,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13790,7 +13876,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnHighlight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13809,16 +13895,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13835,7 +13921,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13854,16 +13940,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13880,7 +13966,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnLeftDoubleClick(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13899,16 +13985,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13925,7 +14011,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -13940,9 +14026,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13958,7 +14044,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -13989,16 +14075,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14017,7 +14103,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePre(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14047,16 +14133,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14073,7 +14159,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMovePost(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     bool arg2 ;
@@ -14094,18 +14180,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14122,7 +14208,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14141,16 +14227,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14167,7 +14253,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14186,16 +14272,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14212,7 +14298,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     bool arg2 ;
@@ -14233,18 +14319,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyBitmapShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14261,7 +14347,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDragRight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14280,16 +14366,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14306,7 +14392,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14325,16 +14411,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyBitmapShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14351,7 +14437,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14379,13 +14465,13 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14401,7 +14487,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawOutline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14435,7 +14521,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnDrawControlPoints(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14469,7 +14555,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnEraseControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14492,7 +14578,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14509,7 +14595,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnMoveLink(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14534,18 +14620,18 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14562,7 +14648,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14585,16 +14671,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14611,7 +14697,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -14634,16 +14720,16 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14660,7 +14746,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnSizingEndDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14675,9 +14761,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14693,7 +14779,7 @@ static PyObject *_wrap_PyBitmapShape_base_OnBeginSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapShape *arg1 = (wxPyBitmapShape *) 0 ;
     double arg2 ;
@@ -14708,9 +14794,9 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyBitmapShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyBitmapShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14726,14 +14812,14 @@ static PyObject *_wrap_PyBitmapShape_base_OnEndSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * PyBitmapShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyBitmapShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyBitmapShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDrawnShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *result;
     char *kwnames[] = {
@@ -14755,7 +14841,7 @@ static PyObject *_wrap_new_PyDrawnShape(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14786,7 +14872,7 @@ static PyObject *_wrap_PyDrawnShape__setCallbackInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14811,7 +14897,7 @@ static PyObject *_wrap_PyDrawnShape_CalculateSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14836,7 +14922,7 @@ static PyObject *_wrap_PyDrawnShape_DestroyClippingRect(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14882,7 +14968,7 @@ static PyObject *_wrap_PyDrawnShape_DrawArc(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -14895,7 +14981,7 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_DrawAtAngle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14911,7 +14997,7 @@ static PyObject *_wrap_PyDrawnShape_DrawAtAngle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -14933,9 +15019,9 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14951,7 +15037,7 @@ static PyObject *_wrap_PyDrawnShape_DrawEllipticArc(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14990,7 +15076,7 @@ static PyObject *_wrap_PyDrawnShape_DrawLine(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15028,7 +15114,7 @@ static PyObject *_wrap_PyDrawnShape_DrawLines(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -15060,7 +15146,7 @@ static PyObject *_wrap_PyDrawnShape_DrawPoint(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15081,7 +15167,7 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args,
         if (arg3 == NULL) SWIG_fail;
     }
     if (obj2) {
-        arg4 = (int) SWIG_AsInt(obj2); 
+        arg4 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15104,7 +15190,7 @@ static PyObject *_wrap_PyDrawnShape_DrawPolygon(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15136,7 +15222,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRectangle(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15156,7 +15242,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15172,7 +15258,7 @@ static PyObject *_wrap_PyDrawnShape_DrawRoundedRectangle(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15210,7 +15296,7 @@ static PyObject *_wrap_PyDrawnShape_DrawSpline(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -15258,7 +15344,7 @@ static PyObject *_wrap_PyDrawnShape_DrawText(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int result;
@@ -15277,14 +15363,14 @@ static PyObject *_wrap_PyDrawnShape_GetAngle(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPseudoMetaFile *result;
@@ -15313,7 +15399,7 @@ static PyObject *_wrap_PyDrawnShape_GetMetaFile(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double result;
@@ -15332,14 +15418,14 @@ static PyObject *_wrap_PyDrawnShape_GetRotation(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -15383,7 +15469,7 @@ static PyObject *_wrap_PyDrawnShape_LoadFromMetaFile(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15400,11 +15486,11 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDrawnShape_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15420,7 +15506,7 @@ static PyObject *_wrap_PyDrawnShape_Rotate(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxRect *arg2 = 0 ;
@@ -15452,7 +15538,7 @@ static PyObject *_wrap_PyDrawnShape_SetClippingRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxColour *arg2 = 0 ;
@@ -15484,7 +15570,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundColour(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     int arg2 ;
@@ -15497,7 +15583,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetDrawnBackgroundMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15513,7 +15599,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBackgroundMode(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -15545,7 +15631,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
         arg2 = NULL;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15562,7 +15648,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnBrush(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -15611,7 +15697,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -15645,7 +15731,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
         arg2 = NULL;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15662,7 +15748,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnPen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxColour *arg2 = 0 ;
@@ -15694,7 +15780,7 @@ static PyObject *_wrap_PyDrawnShape_SetDrawnTextColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15709,9 +15795,9 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15727,7 +15813,7 @@ static PyObject *_wrap_PyDrawnShape_Scale(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -15740,7 +15826,7 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDrawnShape_SetSaveToFile",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15756,7 +15842,7 @@ static PyObject *_wrap_PyDrawnShape_SetSaveToFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_Translate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -15771,9 +15857,9 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_Translate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15789,7 +15875,7 @@ static PyObject *_wrap_PyDrawnShape_Translate(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15814,7 +15900,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDelete(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15848,7 +15934,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDraw(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15882,7 +15968,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15905,7 +15991,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15922,7 +16008,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawBranches(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15956,7 +16042,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLinks(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -15990,7 +16076,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnErase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16024,7 +16110,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseContents(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16058,7 +16144,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnHighlight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16077,16 +16163,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16103,7 +16189,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftClick(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16122,16 +16208,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16148,7 +16234,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnLeftDoubleClick(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16167,16 +16253,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16193,7 +16279,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnRightClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16208,9 +16294,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16226,7 +16312,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16257,16 +16343,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16285,7 +16371,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePre(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16315,16 +16401,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16341,7 +16427,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMovePost(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -16362,18 +16448,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16390,7 +16476,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragLeft(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16409,16 +16495,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16435,7 +16521,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16454,16 +16540,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16480,7 +16566,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     bool arg2 ;
@@ -16501,18 +16587,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDrawnShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16529,7 +16615,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDragRight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16548,16 +16634,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16574,7 +16660,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16593,16 +16679,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDrawnShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16619,7 +16705,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16647,13 +16733,13 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16669,7 +16755,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawOutline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16703,7 +16789,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnDrawControlPoints(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16737,7 +16823,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnEraseControlPoints(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -16760,7 +16846,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16777,7 +16863,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnMoveLink(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16802,18 +16888,18 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16830,7 +16916,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16853,16 +16939,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16879,7 +16965,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingBeginDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -16902,16 +16988,16 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16928,7 +17014,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnSizingEndDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16943,9 +17029,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16961,7 +17047,7 @@ static PyObject *_wrap_PyDrawnShape_base_OnBeginSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDrawnShape *arg1 = (wxPyDrawnShape *) 0 ;
     double arg2 ;
@@ -16976,9 +17062,9 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDrawnShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDrawnShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16994,14 +17080,14 @@ static PyObject *_wrap_PyDrawnShape_base_OnEndSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * PyDrawnShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDrawnShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDrawnShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_OGLConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17015,7 +17101,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_OGLConstraint",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17036,7 +17122,7 @@ static PyObject *_wrap_new_OGLConstraint(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     bool result;
@@ -17064,7 +17150,7 @@ static PyObject *_wrap_OGLConstraint_Evaluate(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     double arg2 ;
@@ -17079,9 +17165,9 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_SetSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17097,7 +17183,7 @@ static PyObject *_wrap_OGLConstraint_SetSpacing(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLConstraint_Equals(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOGLConstraint *arg1 = (wxOGLConstraint *) 0 ;
     double arg2 ;
@@ -17113,9 +17199,9 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:OGLConstraint_Equals",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxOGLConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17133,14 +17219,14 @@ static PyObject *_wrap_OGLConstraint_Equals(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * OGLConstraint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * OGLConstraint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxOGLConstraint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCompositeShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *result;
     char *kwnames[] = {
@@ -17162,7 +17248,7 @@ static PyObject *_wrap_new_PyCompositeShape(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -17193,7 +17279,7 @@ static PyObject *_wrap_PyCompositeShape__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17228,7 +17314,7 @@ static PyObject *_wrap_PyCompositeShape_AddChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxOGLConstraint *arg2 = (wxOGLConstraint *) 0 ;
@@ -17260,7 +17346,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstraint(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     int arg2 ;
@@ -17278,7 +17364,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddConstrainedShapes",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17299,7 +17385,7 @@ static PyObject *_wrap_PyCompositeShape_AddConstrainedShapes(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     int arg2 ;
@@ -17317,7 +17403,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyCompositeShape_AddSimpleConstraint",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17339,7 +17425,7 @@ static PyObject *_wrap_PyCompositeShape_AddSimpleConstraint(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17364,7 +17450,7 @@ static PyObject *_wrap_PyCompositeShape_CalculateSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -17396,7 +17482,7 @@ static PyObject *_wrap_PyCompositeShape_ContainsDivision(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxOGLConstraint *arg2 = (wxOGLConstraint *) 0 ;
@@ -17425,7 +17511,7 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraint(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17454,7 +17540,7 @@ static PyObject *_wrap_PyCompositeShape_DeleteConstraintsInvolvingChild(PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *result;
@@ -17482,7 +17568,7 @@ static PyObject *_wrap_PyCompositeShape_FindContainerImage(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *result;
@@ -17508,7 +17594,7 @@ static PyObject *_wrap_PyCompositeShape_GetConstraints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject *result;
@@ -17534,7 +17620,7 @@ static PyObject *_wrap_PyCompositeShape_GetDivisions(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17559,7 +17645,7 @@ static PyObject *_wrap_PyCompositeShape_MakeContainer(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool result;
@@ -17587,7 +17673,7 @@ static PyObject *_wrap_PyCompositeShape_Recompute(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -17616,7 +17702,7 @@ static PyObject *_wrap_PyCompositeShape_RemoveChild(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17641,7 +17727,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDelete(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17675,7 +17761,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDraw(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17709,7 +17795,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawContents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17732,7 +17818,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17749,7 +17835,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawBranches(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17783,7 +17869,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLinks(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17817,7 +17903,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnErase(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17851,7 +17937,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseContents(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -17885,7 +17971,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnHighlight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17904,16 +17990,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17930,7 +18016,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftClick(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17949,16 +18035,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17975,7 +18061,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnLeftDoubleClick(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -17994,16 +18080,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18020,7 +18106,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnRightClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18035,9 +18121,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18053,7 +18139,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18084,16 +18170,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18112,7 +18198,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePre(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18142,16 +18228,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18168,7 +18254,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMovePost(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool arg2 ;
@@ -18189,18 +18275,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18217,7 +18303,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18236,16 +18322,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18262,7 +18348,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18281,16 +18367,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18307,7 +18393,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     bool arg2 ;
@@ -18328,18 +18414,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCompositeShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18356,7 +18442,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18375,16 +18461,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18401,7 +18487,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginDragRight(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18420,16 +18506,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCompositeShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18446,7 +18532,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18474,13 +18560,13 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18496,7 +18582,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawOutline(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18530,7 +18616,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnDrawControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18564,7 +18650,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnEraseControlPoints(PyObject *self
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18587,7 +18673,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18604,7 +18690,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnMoveLink(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18629,18 +18715,18 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18657,7 +18743,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18680,16 +18766,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18706,7 +18792,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingBeginDragLeft(PyObject *sel
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -18729,16 +18815,16 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18755,7 +18841,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnSizingEndDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18770,9 +18856,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18788,7 +18874,7 @@ static PyObject *_wrap_PyCompositeShape_base_OnBeginSize(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCompositeShape *arg1 = (wxPyCompositeShape *) 0 ;
     double arg2 ;
@@ -18803,9 +18889,9 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCompositeShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCompositeShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18821,14 +18907,14 @@ static PyObject *_wrap_PyCompositeShape_base_OnEndSize(PyObject *self, PyObject
 }
 
 
-static PyObject * PyCompositeShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyCompositeShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyCompositeShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDividedShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -18841,11 +18927,11 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyDividedShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18862,7 +18948,7 @@ static PyObject *_wrap_new_PyDividedShape(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -18893,7 +18979,7 @@ static PyObject *_wrap_PyDividedShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18918,7 +19004,7 @@ static PyObject *_wrap_PyDividedShape_EditRegions(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18943,7 +19029,7 @@ static PyObject *_wrap_PyDividedShape_SetRegionSizes(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18968,7 +19054,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDelete(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19002,7 +19088,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19036,7 +19122,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19059,7 +19145,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19076,7 +19162,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19110,7 +19196,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19144,7 +19230,7 @@ static PyObject *_wrap_PyDividedShape_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19178,7 +19264,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19212,7 +19298,7 @@ static PyObject *_wrap_PyDividedShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19231,16 +19317,16 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19257,7 +19343,7 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19276,16 +19362,16 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19302,7 +19388,7 @@ static PyObject *_wrap_PyDividedShape_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19321,16 +19407,16 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19347,7 +19433,7 @@ static PyObject *_wrap_PyDividedShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19362,9 +19448,9 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19380,7 +19466,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19411,16 +19497,16 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19439,7 +19525,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePre(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19469,16 +19555,16 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19495,7 +19581,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     bool arg2 ;
@@ -19516,18 +19602,18 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19544,7 +19630,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19563,16 +19649,16 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19589,7 +19675,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19608,16 +19694,16 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19634,7 +19720,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     bool arg2 ;
@@ -19655,18 +19741,18 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDividedShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19683,7 +19769,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19702,16 +19788,16 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19728,7 +19814,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -19747,16 +19833,16 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDividedShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19773,7 +19859,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19801,13 +19887,13 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19823,7 +19909,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19857,7 +19943,7 @@ static PyObject *_wrap_PyDividedShape_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19891,7 +19977,7 @@ static PyObject *_wrap_PyDividedShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -19914,7 +20000,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19931,7 +20017,7 @@ static PyObject *_wrap_PyDividedShape_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -19956,18 +20042,18 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19984,7 +20070,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -20007,16 +20093,16 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -20033,7 +20119,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -20056,16 +20142,16 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -20082,7 +20168,7 @@ static PyObject *_wrap_PyDividedShape_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -20097,9 +20183,9 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20115,7 +20201,7 @@ static PyObject *_wrap_PyDividedShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDividedShape *arg1 = (wxPyDividedShape *) 0 ;
     double arg2 ;
@@ -20130,9 +20216,9 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDividedShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDividedShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20148,14 +20234,14 @@ static PyObject *_wrap_PyDividedShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyDividedShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDividedShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDividedShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDivisionShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *result;
     char *kwnames[] = {
@@ -20177,7 +20263,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -20208,7 +20294,7 @@ static PyObject *_wrap_PyDivisionShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20223,9 +20309,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustBottom",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20241,7 +20327,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustBottom(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20256,9 +20342,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustLeft",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20274,7 +20360,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustLeft(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20289,9 +20375,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustRight",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20307,7 +20393,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustRight(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20322,9 +20408,9 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_AdjustTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20340,7 +20426,7 @@ static PyObject *_wrap_PyDivisionShape_AdjustTop(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_Divide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20353,7 +20439,7 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_Divide",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20369,7 +20455,7 @@ static PyObject *_wrap_PyDivisionShape_Divide(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20382,7 +20468,7 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_EditEdge",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20398,7 +20484,7 @@ static PyObject *_wrap_PyDivisionShape_EditEdge(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20426,7 +20512,7 @@ static PyObject *_wrap_PyDivisionShape_GetBottomSide(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int result;
@@ -20445,14 +20531,14 @@ static PyObject *_wrap_PyDivisionShape_GetHandleSide(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20480,7 +20566,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSide(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString result;
@@ -20512,7 +20598,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSideColour(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *result;
@@ -20538,7 +20624,7 @@ static PyObject *_wrap_PyDivisionShape_GetLeftSidePen(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20566,7 +20652,7 @@ static PyObject *_wrap_PyDivisionShape_GetRightSide(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *result;
@@ -20594,7 +20680,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSide(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *result;
@@ -20620,7 +20706,7 @@ static PyObject *_wrap_PyDivisionShape_GetTopSidePen(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20637,11 +20723,11 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyDivisionShape_ResizeAdjoining",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (bool) SWIG_AsBool(obj3); 
+    arg4 = (bool)SWIG_As_bool(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20657,7 +20743,7 @@ static PyObject *_wrap_PyDivisionShape_ResizeAdjoining(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -20672,9 +20758,9 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_PopupMenu",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20690,7 +20776,7 @@ static PyObject *_wrap_PyDivisionShape_PopupMenu(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20719,7 +20805,7 @@ static PyObject *_wrap_PyDivisionShape_SetBottomSide(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     int arg2 ;
@@ -20732,7 +20818,7 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyDivisionShape_SetHandleSide",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20748,7 +20834,7 @@ static PyObject *_wrap_PyDivisionShape_SetHandleSide(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20777,7 +20863,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSide(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -20818,7 +20904,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSideColour(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -20863,7 +20949,7 @@ static PyObject *_wrap_PyDivisionShape_SetLeftSidePen(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20892,7 +20978,7 @@ static PyObject *_wrap_PyDivisionShape_SetRightSide(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyDivisionShape *arg2 = (wxPyDivisionShape *) 0 ;
@@ -20921,7 +21007,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSide(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -20962,7 +21048,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSideColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -21007,7 +21093,7 @@ static PyObject *_wrap_PyDivisionShape_SetTopSidePen(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21032,7 +21118,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDelete(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21066,7 +21152,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDraw(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21100,7 +21186,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21123,7 +21209,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21140,7 +21226,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawBranches(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21174,7 +21260,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21208,7 +21294,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnErase(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21242,7 +21328,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseContents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21276,7 +21362,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21295,16 +21381,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21321,7 +21407,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21340,16 +21426,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21366,7 +21452,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnLeftDoubleClick(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21385,16 +21471,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21411,7 +21497,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnRightClick(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21426,9 +21512,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21444,7 +21530,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21475,16 +21561,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21503,7 +21589,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePre(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21533,16 +21619,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21559,7 +21645,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMovePost(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     bool arg2 ;
@@ -21580,18 +21666,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21608,7 +21694,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21627,16 +21713,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21653,7 +21739,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21672,16 +21758,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21698,7 +21784,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     bool arg2 ;
@@ -21719,18 +21805,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyDivisionShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21747,7 +21833,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21766,16 +21852,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21792,7 +21878,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginDragRight(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -21811,16 +21897,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyDivisionShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21837,7 +21923,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21865,13 +21951,13 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21887,7 +21973,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawOutline(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21921,7 +22007,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnDrawControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21955,7 +22041,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -21978,7 +22064,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21995,7 +22081,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnMoveLink(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22020,18 +22106,18 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22048,7 +22134,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingDragLeft(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22071,16 +22157,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22097,7 +22183,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingBeginDragLeft(PyObject *self
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -22120,16 +22206,16 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22146,7 +22232,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnSizingEndDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22161,9 +22247,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22179,7 +22265,7 @@ static PyObject *_wrap_PyDivisionShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDivisionShape *arg1 = (wxPyDivisionShape *) 0 ;
     double arg2 ;
@@ -22194,9 +22280,9 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyDivisionShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDivisionShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22212,14 +22298,14 @@ static PyObject *_wrap_PyDivisionShape_base_OnEndSize(PyObject *self, PyObject *
 }
 
 
-static PyObject * PyDivisionShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDivisionShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDivisionShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyEllipseShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -22232,11 +22318,11 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEllipseShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22253,7 +22339,7 @@ static PyObject *_wrap_new_PyEllipseShape(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -22284,7 +22370,7 @@ static PyObject *_wrap_PyEllipseShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22318,7 +22404,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22352,7 +22438,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22375,7 +22461,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22392,7 +22478,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22426,7 +22512,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22460,7 +22546,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22494,7 +22580,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22528,7 +22614,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22547,16 +22633,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22573,7 +22659,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22592,16 +22678,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22618,7 +22704,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22637,16 +22723,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22663,7 +22749,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22678,9 +22764,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22696,7 +22782,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22727,16 +22813,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22755,7 +22841,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePre(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -22785,16 +22871,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22811,7 +22897,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     bool arg2 ;
@@ -22832,18 +22918,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22860,7 +22946,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22879,16 +22965,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22905,7 +22991,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -22924,16 +23010,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22950,7 +23036,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     bool arg2 ;
@@ -22971,18 +23057,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyEllipseShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22999,7 +23085,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23018,16 +23104,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23044,7 +23130,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23063,16 +23149,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyEllipseShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23089,7 +23175,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23117,13 +23203,13 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23139,7 +23225,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23173,7 +23259,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23207,7 +23293,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23230,7 +23316,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23247,7 +23333,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23272,18 +23358,18 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23300,7 +23386,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23323,16 +23409,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23349,7 +23435,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -23372,16 +23458,16 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23398,7 +23484,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23413,9 +23499,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23431,7 +23517,7 @@ static PyObject *_wrap_PyEllipseShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEllipseShape *arg1 = (wxPyEllipseShape *) 0 ;
     double arg2 ;
@@ -23446,9 +23532,9 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyEllipseShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyEllipseShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23464,14 +23550,14 @@ static PyObject *_wrap_PyEllipseShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyEllipseShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyEllipseShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyEllipseShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCircleShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     wxPyCircleShape *result;
@@ -23482,7 +23568,7 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PyCircleShape",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23499,7 +23585,7 @@ static PyObject *_wrap_new_PyCircleShape(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -23530,7 +23616,7 @@ static PyObject *_wrap_PyCircleShape__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23564,7 +23650,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDraw(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23598,7 +23684,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawContents(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23621,7 +23707,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23638,7 +23724,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawBranches(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23672,7 +23758,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLinks(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23706,7 +23792,7 @@ static PyObject *_wrap_PyCircleShape_base_OnErase(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23740,7 +23826,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23774,7 +23860,7 @@ static PyObject *_wrap_PyCircleShape_base_OnHighlight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23793,16 +23879,16 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23819,7 +23905,7 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23838,16 +23924,16 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23864,7 +23950,7 @@ static PyObject *_wrap_PyCircleShape_base_OnLeftDoubleClick(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23883,16 +23969,16 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23909,7 +23995,7 @@ static PyObject *_wrap_PyCircleShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -23924,9 +24010,9 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23942,7 +24028,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -23973,16 +24059,16 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24001,7 +24087,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePre(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24031,16 +24117,16 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24057,7 +24143,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMovePost(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     bool arg2 ;
@@ -24078,18 +24164,18 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24106,7 +24192,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24125,16 +24211,16 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24151,7 +24237,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24170,16 +24256,16 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24196,7 +24282,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     bool arg2 ;
@@ -24217,18 +24303,18 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyCircleShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24245,7 +24331,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDragRight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24264,16 +24350,16 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24290,7 +24376,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24309,16 +24395,16 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyCircleShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24335,7 +24421,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEndDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24363,13 +24449,13 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24385,7 +24471,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawOutline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24419,7 +24505,7 @@ static PyObject *_wrap_PyCircleShape_base_OnDrawControlPoints(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24453,7 +24539,7 @@ static PyObject *_wrap_PyCircleShape_base_OnEraseControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -24476,7 +24562,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24493,7 +24579,7 @@ static PyObject *_wrap_PyCircleShape_base_OnMoveLink(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -24518,18 +24604,18 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24546,7 +24632,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -24569,16 +24655,16 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24595,7 +24681,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -24618,16 +24704,16 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24644,7 +24730,7 @@ static PyObject *_wrap_PyCircleShape_base_OnSizingEndDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24659,9 +24745,9 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24677,7 +24763,7 @@ static PyObject *_wrap_PyCircleShape_base_OnBeginSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCircleShape *arg1 = (wxPyCircleShape *) 0 ;
     double arg2 ;
@@ -24692,9 +24778,9 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyCircleShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyCircleShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24710,14 +24796,14 @@ static PyObject *_wrap_PyCircleShape_base_OnEndSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * PyCircleShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyCircleShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyCircleShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -24742,19 +24828,19 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOOOOO:new_ArrowHead",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (double) SWIG_AsDouble(obj2); 
+        arg3 = (double)SWIG_As_double(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (double) SWIG_AsDouble(obj3); 
+        arg4 = (double)SWIG_As_double(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -24769,7 +24855,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24796,7 +24882,7 @@ static PyObject *_wrap_new_ArrowHead(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24821,7 +24907,7 @@ static PyObject *_wrap_delete_ArrowHead(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead__GetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -24840,14 +24926,14 @@ static PyObject *_wrap_ArrowHead__GetType(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -24866,14 +24952,14 @@ static PyObject *_wrap_ArrowHead_GetPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int arg2 ;
@@ -24886,7 +24972,7 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24902,7 +24988,7 @@ static PyObject *_wrap_ArrowHead_SetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24921,14 +25007,14 @@ static PyObject *_wrap_ArrowHead_GetXOffset(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24947,14 +25033,14 @@ static PyObject *_wrap_ArrowHead_GetYOffset(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24973,14 +25059,14 @@ static PyObject *_wrap_ArrowHead_GetSpacing(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -24999,14 +25085,14 @@ static PyObject *_wrap_ArrowHead_GetSize(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     wxString result;
@@ -25038,7 +25124,7 @@ static PyObject *_wrap_ArrowHead_GetName(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25051,7 +25137,7 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetXOffset",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25067,7 +25153,7 @@ static PyObject *_wrap_ArrowHead_SetXOffset(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25080,7 +25166,7 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetYOffset",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25096,7 +25182,7 @@ static PyObject *_wrap_ArrowHead_SetYOffset(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     wxPseudoMetaFile *result;
@@ -25124,7 +25210,7 @@ static PyObject *_wrap_ArrowHead_GetMetaFile(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     long result;
@@ -25143,14 +25229,14 @@ static PyObject *_wrap_ArrowHead_GetId(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     int result;
@@ -25169,14 +25255,14 @@ static PyObject *_wrap_ArrowHead_GetArrowEnd(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double result;
@@ -25195,14 +25281,14 @@ static PyObject *_wrap_ArrowHead_GetArrowSize(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25215,7 +25301,7 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25231,7 +25317,7 @@ static PyObject *_wrap_ArrowHead_SetSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrowHead *arg1 = (wxArrowHead *) 0 ;
     double arg2 ;
@@ -25244,7 +25330,7 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ArrowHead_SetSpacing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25260,14 +25346,14 @@ static PyObject *_wrap_ArrowHead_SetSpacing(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * ArrowHead_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ArrowHead_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxArrowHead, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyLineShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *result;
     char *kwnames[] = {
@@ -25289,7 +25375,7 @@ static PyObject *_wrap_new_PyLineShape(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25320,7 +25406,7 @@ static PyObject *_wrap_PyLineShape__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_AddArrow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25347,18 +25433,18 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:PyLineShape_AddArrow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (double) SWIG_AsDouble(obj3); 
+        arg4 = (double)SWIG_As_double(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (double) SWIG_AsDouble(obj4); 
+        arg5 = (double)SWIG_As_double(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -25373,7 +25459,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (long) SWIG_AsLong(obj7); 
+        arg8 = (long)SWIG_As_long(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25398,7 +25484,7 @@ static PyObject *_wrap_PyLineShape_AddArrow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxArrowHead *arg2 = (wxArrowHead *) 0 ;
@@ -25418,7 +25504,7 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     arg3 = obj2;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25434,7 +25520,7 @@ static PyObject *_wrap_PyLineShape_AddArrowOrdered(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxString *arg2 = 0 ;
@@ -25478,7 +25564,7 @@ static PyObject *_wrap_PyLineShape_ClearArrow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 = (int) -1 ;
@@ -25492,7 +25578,7 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25509,7 +25595,7 @@ static PyObject *_wrap_PyLineShape_ClearArrowsAtPosition(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25537,9 +25623,9 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO
     }
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxArrowHead,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (bool) SWIG_AsBool(obj4); 
+    arg5 = (bool)SWIG_As_bool(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25555,7 +25641,7 @@ static PyObject *_wrap_PyLineShape_DrawArrow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     long arg2 ;
@@ -25569,7 +25655,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_DeleteArrowHeadId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25587,7 +25673,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHeadId(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25604,7 +25690,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_DeleteArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -25635,7 +25721,7 @@ static PyObject *_wrap_PyLineShape_DeleteArrowHead(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool result;
@@ -25663,7 +25749,7 @@ static PyObject *_wrap_PyLineShape_DeleteLineControlPoint(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25697,7 +25783,7 @@ static PyObject *_wrap_PyLineShape_DrawArrows(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25725,9 +25811,9 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py
     }
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25743,7 +25829,7 @@ static PyObject *_wrap_PyLineShape_DrawRegion(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25771,9 +25857,9 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P
     }
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxShapeRegion,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25789,7 +25875,7 @@ static PyObject *_wrap_PyLineShape_EraseRegion(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     long arg2 ;
@@ -25803,7 +25889,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_FindArrowHeadId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25821,7 +25907,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHeadId(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -25838,7 +25924,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindArrowHead",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -25869,7 +25955,7 @@ static PyObject *_wrap_PyLineShape_FindArrowHead(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -25877,18 +25963,22 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *a
     double *arg4 = (double *) 0 ;
     double *arg5 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     double temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_FindLineEndPoints",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -25900,29 +25990,21 @@ static PyObject *_wrap_PyLineShape_FindLineEndPoints(PyObject *self, PyObject *a
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -25938,9 +26020,9 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindLinePosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25949,14 +26031,14 @@ static PyObject *_wrap_PyLineShape_FindLinePosition(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double result;
@@ -25975,14 +26057,14 @@ static PyObject *_wrap_PyLineShape_FindMinimumWidth(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_FindNth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -25990,7 +26072,9 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
     int *arg4 = (int *) 0 ;
     bool arg5 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -25998,14 +26082,14 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
         (char *) "self",(char *) "image",(char *) "incoming", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_FindNth",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg5 = (bool) SWIG_AsBool(obj2); 
+    arg5 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26015,21 +26099,17 @@ static PyObject *_wrap_PyLineShape_FindNth(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26048,14 +26128,14 @@ static PyObject *_wrap_PyLineShape_GetAttachmentFrom(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26074,14 +26154,14 @@ static PyObject *_wrap_PyLineShape_GetAttachmentTo(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetEnds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double *arg2 = (double *) 0 ;
@@ -26089,18 +26169,22 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObj
     double *arg4 = (double *) 0 ;
     double *arg5 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     double temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyLineShape_GetEnds",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -26112,29 +26196,21 @@ static PyObject *_wrap_PyLineShape_GetEnds(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *result;
@@ -26162,26 +26238,28 @@ static PyObject *_wrap_PyLineShape_GetFrom(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
     double *arg3 = (double *) 0 ;
     double *arg4 = (double *) 0 ;
     double temp3 ;
+    int res3 = 0 ;
     double temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "position", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetLabelPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26191,21 +26269,17 @@ static PyObject *_wrap_PyLineShape_GetLabelPosition(PyObject *self, PyObject *ar
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26235,7 +26309,7 @@ static PyObject *_wrap_PyLineShape_GetNextControlPoint(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *result;
@@ -26263,7 +26337,7 @@ static PyObject *_wrap_PyLineShape_GetTo(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Initialise(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26288,7 +26362,7 @@ static PyObject *_wrap_PyLineShape_Initialise(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -26317,7 +26391,7 @@ static PyObject *_wrap_PyLineShape_InsertLineControlPoint(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_IsEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26349,7 +26423,7 @@ static PyObject *_wrap_PyLineShape_IsEnd(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_IsSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool result;
@@ -26377,7 +26451,7 @@ static PyObject *_wrap_PyLineShape_IsSpline(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26390,7 +26464,7 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_MakeLineControlPoints",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26406,7 +26480,7 @@ static PyObject *_wrap_PyLineShape_MakeLineControlPoints(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *result;
@@ -26432,7 +26506,7 @@ static PyObject *_wrap_PyLineShape_GetLineControlPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -26460,7 +26534,7 @@ static PyObject *_wrap_PyLineShape_SetLineControlPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26473,7 +26547,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentFrom",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26489,7 +26563,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentFrom(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26504,9 +26578,9 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAttachments",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26522,7 +26596,7 @@ static PyObject *_wrap_PyLineShape_SetAttachments(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int arg2 ;
@@ -26535,7 +26609,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetAttachmentTo",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26551,7 +26625,7 @@ static PyObject *_wrap_PyLineShape_SetAttachmentTo(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetEnds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -26570,13 +26644,13 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyLineShape_SetEnds",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26592,7 +26666,7 @@ static PyObject *_wrap_PyLineShape_SetEnds(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26621,7 +26695,7 @@ static PyObject *_wrap_PyLineShape_SetFrom(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26634,7 +26708,7 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetIgnoreOffsets",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26650,7 +26724,7 @@ static PyObject *_wrap_PyLineShape_SetIgnoreOffsets(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26663,7 +26737,7 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_SetSpline",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26679,7 +26753,7 @@ static PyObject *_wrap_PyLineShape_SetSpline(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -26708,7 +26782,7 @@ static PyObject *_wrap_PyLineShape_SetTo(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Straighten(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = (wxDC *) NULL ;
@@ -26739,7 +26813,7 @@ static PyObject *_wrap_PyLineShape_Straighten(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_Unlink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26764,7 +26838,7 @@ static PyObject *_wrap_PyLineShape_Unlink(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26779,9 +26853,9 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentOrientation",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26797,7 +26871,7 @@ static PyObject *_wrap_PyLineShape_SetAlignmentOrientation(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26812,9 +26886,9 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_SetAlignmentType",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26830,7 +26904,7 @@ static PyObject *_wrap_PyLineShape_SetAlignmentType(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26844,7 +26918,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26862,7 +26936,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentOrientation(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -26876,7 +26950,7 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyLineShape_GetAlignmentType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26885,14 +26959,14 @@ static PyObject *_wrap_PyLineShape_GetAlignmentType(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26911,14 +26985,14 @@ static PyObject *_wrap_PyLineShape_GetAlignmentStart(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     int result;
@@ -26937,14 +27011,14 @@ static PyObject *_wrap_PyLineShape_GetAlignmentEnd(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -26978,7 +27052,7 @@ static PyObject *_wrap_PyLineShape_base_OnDraw(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27012,7 +27086,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27035,7 +27109,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27052,7 +27126,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawBranches(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27086,7 +27160,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLinks(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27120,7 +27194,7 @@ static PyObject *_wrap_PyLineShape_base_OnErase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27154,7 +27228,7 @@ static PyObject *_wrap_PyLineShape_base_OnEraseContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27188,7 +27262,7 @@ static PyObject *_wrap_PyLineShape_base_OnHighlight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27207,16 +27281,16 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27233,7 +27307,7 @@ static PyObject *_wrap_PyLineShape_base_OnLeftClick(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27252,16 +27326,16 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27278,7 +27352,7 @@ static PyObject *_wrap_PyLineShape_base_OnLeftDoubleClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27297,16 +27371,16 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27323,7 +27397,7 @@ static PyObject *_wrap_PyLineShape_base_OnRightClick(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27338,9 +27412,9 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27356,7 +27430,7 @@ static PyObject *_wrap_PyLineShape_base_OnSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27387,16 +27461,16 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27415,7 +27489,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePre(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27445,16 +27519,16 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27471,7 +27545,7 @@ static PyObject *_wrap_PyLineShape_base_OnMovePost(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27492,18 +27566,18 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27520,7 +27594,7 @@ static PyObject *_wrap_PyLineShape_base_OnDragLeft(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27539,16 +27613,16 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27565,7 +27639,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27584,16 +27658,16 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27610,7 +27684,7 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     bool arg2 ;
@@ -27631,18 +27705,18 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyLineShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27659,7 +27733,7 @@ static PyObject *_wrap_PyLineShape_base_OnDragRight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27678,16 +27752,16 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27704,7 +27778,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -27723,16 +27797,16 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyLineShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27749,7 +27823,7 @@ static PyObject *_wrap_PyLineShape_base_OnEndDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27777,13 +27851,13 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27799,7 +27873,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawOutline(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27833,7 +27907,7 @@ static PyObject *_wrap_PyLineShape_base_OnDrawControlPoints(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27867,7 +27941,7 @@ static PyObject *_wrap_PyLineShape_base_OnEraseControlPoints(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -27890,7 +27964,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27907,7 +27981,7 @@ static PyObject *_wrap_PyLineShape_base_OnMoveLink(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -27932,18 +28006,18 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27960,7 +28034,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -27983,16 +28057,16 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28009,7 +28083,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingBeginDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -28032,16 +28106,16 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28058,7 +28132,7 @@ static PyObject *_wrap_PyLineShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28073,9 +28147,9 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28091,7 +28165,7 @@ static PyObject *_wrap_PyLineShape_base_OnBeginSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLineShape *arg1 = (wxPyLineShape *) 0 ;
     double arg2 ;
@@ -28106,9 +28180,9 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyLineShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyLineShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28124,14 +28198,14 @@ static PyObject *_wrap_PyLineShape_base_OnEndSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject * PyLineShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyLineShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyLineShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyPolygonShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *result;
     char *kwnames[] = {
@@ -28153,7 +28227,7 @@ static PyObject *_wrap_new_PyPolygonShape(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -28184,7 +28258,7 @@ static PyObject *_wrap_PyPolygonShape__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -28213,7 +28287,7 @@ static PyObject *_wrap_PyPolygonShape_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -28227,7 +28301,7 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28244,7 +28318,7 @@ static PyObject *_wrap_PyPolygonShape_AddPolygonPoint(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28269,7 +28343,7 @@ static PyObject *_wrap_PyPolygonShape_CalculatePolygonCentre(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     int arg2 = (int) 0 ;
@@ -28283,7 +28357,7 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28300,7 +28374,7 @@ static PyObject *_wrap_PyPolygonShape_DeletePolygonPoint(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *result;
@@ -28326,7 +28400,7 @@ static PyObject *_wrap_PyPolygonShape_GetPoints(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject *result;
@@ -28352,7 +28426,7 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalPoints(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double result;
@@ -28371,14 +28445,14 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalWidth(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double result;
@@ -28397,14 +28471,14 @@ static PyObject *_wrap_PyPolygonShape_GetOriginalHeight(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28417,7 +28491,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28433,7 +28507,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalWidth(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28446,7 +28520,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPolygonShape_SetOriginalHeight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28462,7 +28536,7 @@ static PyObject *_wrap_PyPolygonShape_SetOriginalHeight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28487,7 +28561,7 @@ static PyObject *_wrap_PyPolygonShape_UpdateOriginalPoints(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28521,7 +28595,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDraw(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28555,7 +28629,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28578,7 +28652,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28595,7 +28669,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawBranches(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28629,7 +28703,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLinks(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28663,7 +28737,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnErase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28697,7 +28771,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseContents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28731,7 +28805,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnHighlight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28750,16 +28824,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28776,7 +28850,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28795,16 +28869,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28821,7 +28895,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnLeftDoubleClick(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28840,16 +28914,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28866,7 +28940,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -28881,9 +28955,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28899,7 +28973,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28930,16 +29004,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28958,7 +29032,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePre(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -28988,16 +29062,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29014,7 +29088,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMovePost(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     bool arg2 ;
@@ -29035,18 +29109,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29063,7 +29137,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29082,16 +29156,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29108,7 +29182,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragLeft(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29127,16 +29201,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29153,7 +29227,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     bool arg2 ;
@@ -29174,18 +29248,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyPolygonShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29202,7 +29276,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29221,16 +29295,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29247,7 +29321,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginDragRight(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29266,16 +29340,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyPolygonShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29292,7 +29366,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndDragRight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29320,13 +29394,13 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29342,7 +29416,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawOutline(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29376,7 +29450,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnDrawControlPoints(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29410,7 +29484,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnEraseControlPoints(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29433,7 +29507,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29450,7 +29524,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnMoveLink(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -29475,18 +29549,18 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29503,7 +29577,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -29526,16 +29600,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29552,7 +29626,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingBeginDragLeft(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -29575,16 +29649,16 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29601,7 +29675,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnSizingEndDragLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29616,9 +29690,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29634,7 +29708,7 @@ static PyObject *_wrap_PyPolygonShape_base_OnBeginSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPolygonShape *arg1 = (wxPyPolygonShape *) 0 ;
     double arg2 ;
@@ -29649,9 +29723,9 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPolygonShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPolygonShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29667,14 +29741,14 @@ static PyObject *_wrap_PyPolygonShape_base_OnEndSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyPolygonShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyPolygonShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPolygonShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyTextShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -29687,11 +29761,11 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyTextShape",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29708,7 +29782,7 @@ static PyObject *_wrap_new_PyTextShape(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -29739,7 +29813,7 @@ static PyObject *_wrap_PyTextShape__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29764,7 +29838,7 @@ static PyObject *_wrap_PyTextShape_base_OnDelete(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29798,7 +29872,7 @@ static PyObject *_wrap_PyTextShape_base_OnDraw(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29832,7 +29906,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29855,7 +29929,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29872,7 +29946,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawBranches(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29906,7 +29980,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLinks(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29940,7 +30014,7 @@ static PyObject *_wrap_PyTextShape_base_OnErase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -29974,7 +30048,7 @@ static PyObject *_wrap_PyTextShape_base_OnEraseContents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30008,7 +30082,7 @@ static PyObject *_wrap_PyTextShape_base_OnHighlight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30027,16 +30101,16 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30053,7 +30127,7 @@ static PyObject *_wrap_PyTextShape_base_OnLeftClick(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30072,16 +30146,16 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnLeftDoubleClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30098,7 +30172,7 @@ static PyObject *_wrap_PyTextShape_base_OnLeftDoubleClick(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30117,16 +30191,16 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30143,7 +30217,7 @@ static PyObject *_wrap_PyTextShape_base_OnRightClick(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30158,9 +30232,9 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30176,7 +30250,7 @@ static PyObject *_wrap_PyTextShape_base_OnSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30207,16 +30281,16 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30235,7 +30309,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePre(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30265,16 +30339,16 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30291,7 +30365,7 @@ static PyObject *_wrap_PyTextShape_base_OnMovePost(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     bool arg2 ;
@@ -30312,18 +30386,18 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30340,7 +30414,7 @@ static PyObject *_wrap_PyTextShape_base_OnDragLeft(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30359,16 +30433,16 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30385,7 +30459,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30404,16 +30478,16 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30430,7 +30504,7 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragLeft(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     bool arg2 ;
@@ -30451,18 +30525,18 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:PyTextShape_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30479,7 +30553,7 @@ static PyObject *_wrap_PyTextShape_base_OnDragRight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30498,16 +30572,16 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30524,7 +30598,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30543,16 +30617,16 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyTextShape_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30569,7 +30643,7 @@ static PyObject *_wrap_PyTextShape_base_OnEndDragRight(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30597,13 +30671,13 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30619,7 +30693,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawOutline(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30653,7 +30727,7 @@ static PyObject *_wrap_PyTextShape_base_OnDrawControlPoints(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30687,7 +30761,7 @@ static PyObject *_wrap_PyTextShape_base_OnEraseControlPoints(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxDC *arg2 = 0 ;
@@ -30710,7 +30784,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30727,7 +30801,7 @@ static PyObject *_wrap_PyTextShape_base_OnMoveLink(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30752,18 +30826,18 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30780,7 +30854,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingDragLeft(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30803,16 +30877,16 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30829,7 +30903,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingBeginDragLeft(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     wxPyControlPoint *arg2 = (wxPyControlPoint *) 0 ;
@@ -30852,16 +30926,16 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyControlPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30878,7 +30952,7 @@ static PyObject *_wrap_PyTextShape_base_OnSizingEndDragLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30893,9 +30967,9 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnBeginSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30911,7 +30985,7 @@ static PyObject *_wrap_PyTextShape_base_OnBeginSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextShape *arg1 = (wxPyTextShape *) 0 ;
     double arg2 ;
@@ -30926,9 +31000,9 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyTextShape_base_OnEndSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextShape,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30944,14 +31018,14 @@ static PyObject *_wrap_PyTextShape_base_OnEndSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject * PyTextShape_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyTextShape_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTextShape, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Diagram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Diagram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *result;
     char *kwnames[] = {
@@ -30975,7 +31049,7 @@ static PyObject *_wrap_new_Diagram(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_AddShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31010,7 +31084,7 @@ static PyObject *_wrap_Diagram_AddShape(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31044,7 +31118,7 @@ static PyObject *_wrap_Diagram_Clear(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject * obj0 = 0 ;
@@ -31069,7 +31143,7 @@ static PyObject *_wrap_Diagram_DeleteAllShapes(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_DrawOutline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31097,13 +31171,13 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31119,7 +31193,7 @@ static PyObject *_wrap_Diagram_DrawOutline(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_FindShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     long arg2 ;
@@ -31133,7 +31207,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_FindShape",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31151,7 +31225,7 @@ static PyObject *_wrap_Diagram_FindShape(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShapeCanvas *result;
@@ -31179,7 +31253,7 @@ static PyObject *_wrap_Diagram_GetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int result;
@@ -31198,14 +31272,14 @@ static PyObject *_wrap_Diagram_GetCount(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double result;
@@ -31224,14 +31298,14 @@ static PyObject *_wrap_Diagram_GetGridSpacing(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int result;
@@ -31250,14 +31324,14 @@ static PyObject *_wrap_Diagram_GetMouseTolerance(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetShapeList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject *result;
@@ -31283,7 +31357,7 @@ static PyObject *_wrap_Diagram_GetShapeList(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool result;
@@ -31311,7 +31385,7 @@ static PyObject *_wrap_Diagram_GetQuickEditMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool result;
@@ -31339,7 +31413,7 @@ static PyObject *_wrap_Diagram_GetSnapToGrid(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_InsertShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31368,7 +31442,7 @@ static PyObject *_wrap_Diagram_InsertShape(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RecentreAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31402,7 +31476,7 @@ static PyObject *_wrap_Diagram_RecentreAll(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Redraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31436,7 +31510,7 @@ static PyObject *_wrap_Diagram_Redraw(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     PyObject * obj0 = 0 ;
@@ -31461,7 +31535,7 @@ static PyObject *_wrap_Diagram_RemoveAllShapes(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_RemoveShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31490,7 +31564,7 @@ static PyObject *_wrap_Diagram_RemoveShape(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     wxPyShapeCanvas *arg2 = (wxPyShapeCanvas *) 0 ;
@@ -31519,7 +31593,7 @@ static PyObject *_wrap_Diagram_SetCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double arg2 ;
@@ -31532,7 +31606,7 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetGridSpacing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31548,7 +31622,7 @@ static PyObject *_wrap_Diagram_SetGridSpacing(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     int arg2 ;
@@ -31561,7 +31635,7 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetMouseTolerance",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31577,7 +31651,7 @@ static PyObject *_wrap_Diagram_SetMouseTolerance(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -31590,7 +31664,7 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetQuickEditMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31606,7 +31680,7 @@ static PyObject *_wrap_Diagram_SetQuickEditMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -31619,7 +31693,7 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_SetSnapToGrid",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31635,7 +31709,7 @@ static PyObject *_wrap_Diagram_SetSnapToGrid(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_ShowAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     bool arg2 ;
@@ -31648,7 +31722,7 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Diagram_ShowAll",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31664,13 +31738,15 @@ static PyObject *_wrap_Diagram_ShowAll(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Diagram_Snap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDiagram *arg1 = (wxDiagram *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -31682,14 +31758,20 @@ static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDiagram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
-        temp2 = PyFloat_AsDouble(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,0) != -1)) {
+            temp2 = SWIG_As_double(obj1);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
-        temp3 = PyFloat_AsDouble(obj2);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg3 = &temp3;
+        if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,0) != -1)) {
+            temp3 = SWIG_As_double(obj2);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = &temp3;
+            res3 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31699,28 +31781,24 @@ static PyObject *_wrap_Diagram_Snap(PyObject *self, PyObject *args, PyObject *kw
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * Diagram_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Diagram_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDiagram, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyShapeCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     int arg2 = (int) -1 ;
@@ -31751,7 +31829,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -31767,7 +31845,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -31800,7 +31878,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -31831,7 +31909,7 @@ static PyObject *_wrap_PyShapeCanvas__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -31866,7 +31944,7 @@ static PyObject *_wrap_PyShapeCanvas_AddShape(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31876,6 +31954,7 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
     wxPyShape *arg6 = (wxPyShape *) NULL ;
     wxPyShape *result;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -31885,13 +31964,13 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
         (char *) "self",(char *) "x1",(char *) "y",(char *) "info",(char *) "notImage", NULL 
     };
     
-    arg4 = &temp4;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:PyShapeCanvas_FindShape",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **)(&arg5),SWIGTYPE_p_wxClassInfo,
@@ -31911,17 +31990,15 @@ static PyObject *_wrap_PyShapeCanvas_FindShape(PyObject *self, PyObject *args, P
     {
         resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -31930,6 +32007,7 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
     int arg5 ;
     wxPyShape *result;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -31938,15 +32016,15 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
         (char *) "self",(char *) "x1",(char *) "y",(char *) "op", NULL 
     };
     
-    arg4 = &temp4;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyShapeCanvas_FindFirstSensitiveShape",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj3); 
+    arg5 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31958,17 +32036,15 @@ static PyObject *_wrap_PyShapeCanvas_FindFirstSensitiveShape(PyObject *self, PyO
     {
         resultobj = wxPyMake_wxShapeEvtHandler(result, 0); 
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDiagram *result;
@@ -31996,7 +32072,7 @@ static PyObject *_wrap_PyShapeCanvas_GetDiagram(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool result;
@@ -32024,7 +32100,7 @@ static PyObject *_wrap_PyShapeCanvas_GetQuickEditMode(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32053,7 +32129,7 @@ static PyObject *_wrap_PyShapeCanvas_InsertShape(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32070,12 +32146,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32092,7 +32168,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragLeft(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32109,12 +32185,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnBeginDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32131,7 +32207,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnBeginDragRight(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32148,12 +32224,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32170,7 +32246,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragLeft(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32187,12 +32263,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnEndDragRight",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32209,7 +32285,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnEndDragRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool arg2 ;
@@ -32228,14 +32304,14 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragLeft",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32252,7 +32328,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     bool arg2 ;
@@ -32271,14 +32347,14 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyShapeCanvas_base_OnDragRight",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32295,7 +32371,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnDragRight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32312,12 +32388,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnLeftClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32334,7 +32410,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnLeftClick(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double arg2 ;
@@ -32351,12 +32427,12 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyShapeCanvas_base_OnRightClick",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32373,7 +32449,7 @@ static PyObject *_wrap_PyShapeCanvas_base_OnRightClick(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDC *arg2 = 0 ;
@@ -32407,7 +32483,7 @@ static PyObject *_wrap_PyShapeCanvas_Redraw(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxPyShape *arg2 = (wxPyShape *) 0 ;
@@ -32436,7 +32512,7 @@ static PyObject *_wrap_PyShapeCanvas_RemoveShape(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     wxDiagram *arg2 = (wxDiagram *) 0 ;
@@ -32465,13 +32541,15 @@ static PyObject *_wrap_PyShapeCanvas_SetDiagram(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyShapeCanvas *arg1 = (wxPyShapeCanvas *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -32483,14 +32561,20 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyShapeCanvas,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
-        temp2 = PyFloat_AsDouble(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_double,0) != -1)) {
+            temp2 = SWIG_As_double(obj1);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
-        temp3 = PyFloat_AsDouble(obj2);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg3 = &temp3;
+        if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_double,0) != -1)) {
+            temp3 = SWIG_As_double(obj2);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = &temp3;
+            res3 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32500,28 +32584,24 @@ static PyObject *_wrap_PyShapeCanvas_Snap(PyObject *self, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PyShapeCanvas_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyShapeCanvas_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyShapeCanvas, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_OGLInitialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLInitialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -32543,7 +32623,7 @@ static PyObject *_wrap_OGLInitialize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_OGLCleanUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OGLCleanUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -32566,880 +32646,880 @@ static PyObject *_wrap_OGLCleanUp(PyObject *self, PyObject *args, PyObject *kwar
 
 
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_ShapeRegion", (PyCFunction) _wrap_new_ShapeRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetText", (PyCFunction) _wrap_ShapeRegion_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetFont", (PyCFunction) _wrap_ShapeRegion_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetMinSize", (PyCFunction) _wrap_ShapeRegion_SetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetSize", (PyCFunction) _wrap_ShapeRegion_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetPosition", (PyCFunction) _wrap_ShapeRegion_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetProportions", (PyCFunction) _wrap_ShapeRegion_SetProportions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetFormatMode", (PyCFunction) _wrap_ShapeRegion_SetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetName", (PyCFunction) _wrap_ShapeRegion_SetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetColour", (PyCFunction) _wrap_ShapeRegion_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetText", (PyCFunction) _wrap_ShapeRegion_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetFont", (PyCFunction) _wrap_ShapeRegion_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetMinSize", (PyCFunction) _wrap_ShapeRegion_GetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetProportion", (PyCFunction) _wrap_ShapeRegion_GetProportion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetSize", (PyCFunction) _wrap_ShapeRegion_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetPosition", (PyCFunction) _wrap_ShapeRegion_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetFormatMode", (PyCFunction) _wrap_ShapeRegion_GetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetName", (PyCFunction) _wrap_ShapeRegion_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetColour", (PyCFunction) _wrap_ShapeRegion_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetActualColourObject", (PyCFunction) _wrap_ShapeRegion_GetActualColourObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetFormattedText", (PyCFunction) _wrap_ShapeRegion_GetFormattedText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetPenColour", (PyCFunction) _wrap_ShapeRegion_GetPenColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetPenStyle", (PyCFunction) _wrap_ShapeRegion_GetPenStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetPenStyle", (PyCFunction) _wrap_ShapeRegion_SetPenStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_SetPenColour", (PyCFunction) _wrap_ShapeRegion_SetPenColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetActualPen", (PyCFunction) _wrap_ShapeRegion_GetActualPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetWidth", (PyCFunction) _wrap_ShapeRegion_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_GetHeight", (PyCFunction) _wrap_ShapeRegion_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_ClearText", (PyCFunction) _wrap_ShapeRegion_ClearText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShapeRegion_swigregister", ShapeRegion_swigregister, METH_VARARGS },
-        { (char *)"new_AttachmentPoint", (PyCFunction) _wrap_new_AttachmentPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_id_set", (PyCFunction) _wrap_AttachmentPoint_m_id_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_id_get", (PyCFunction) _wrap_AttachmentPoint_m_id_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_x_set", (PyCFunction) _wrap_AttachmentPoint_m_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_x_get", (PyCFunction) _wrap_AttachmentPoint_m_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_y_set", (PyCFunction) _wrap_AttachmentPoint_m_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_m_y_get", (PyCFunction) _wrap_AttachmentPoint_m_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AttachmentPoint_swigregister", AttachmentPoint_swigregister, METH_VARARGS },
-        { (char *)"new_PyShapeEvtHandler", (PyCFunction) _wrap_new_PyShapeEvtHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler__setCallbackInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler__setOORInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_SetShape", (PyCFunction) _wrap_PyShapeEvtHandler_SetShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_GetShape", (PyCFunction) _wrap_PyShapeEvtHandler_GetShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_GetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_CreateNewCopy", (PyCFunction) _wrap_PyShapeEvtHandler_CreateNewCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDelete", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDraw", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawBranches", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMoveLinks", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnErase", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEraseContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnHighlight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnLeftClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnRightClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMovePre", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMovePost", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawOutline", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnMoveLink", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnBeginSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_base_OnEndSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeEvtHandler_swigregister", PyShapeEvtHandler_swigregister, METH_VARARGS },
-        { (char *)"new_PyShape", (PyCFunction) _wrap_new_PyShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape__setCallbackInfo", (PyCFunction) _wrap_PyShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBoundingBoxMax", (PyCFunction) _wrap_PyShape_GetBoundingBoxMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBoundingBoxMin", (PyCFunction) _wrap_PyShape_GetBoundingBoxMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetPerimeterPoint", (PyCFunction) _wrap_PyShape_GetPerimeterPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetCanvas", (PyCFunction) _wrap_PyShape_GetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetCanvas", (PyCFunction) _wrap_PyShape_SetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddToCanvas", (PyCFunction) _wrap_PyShape_AddToCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_InsertInCanvas", (PyCFunction) _wrap_PyShape_InsertInCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_RemoveFromCanvas", (PyCFunction) _wrap_PyShape_RemoveFromCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetX", (PyCFunction) _wrap_PyShape_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetY", (PyCFunction) _wrap_PyShape_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetX", (PyCFunction) _wrap_PyShape_SetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetY", (PyCFunction) _wrap_PyShape_SetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetParent", (PyCFunction) _wrap_PyShape_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetParent", (PyCFunction) _wrap_PyShape_SetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetTopAncestor", (PyCFunction) _wrap_PyShape_GetTopAncestor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetChildren", (PyCFunction) _wrap_PyShape_GetChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Unlink", (PyCFunction) _wrap_PyShape_Unlink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDrawHandles", (PyCFunction) _wrap_PyShape_SetDrawHandles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetDrawHandles", (PyCFunction) _wrap_PyShape_GetDrawHandles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MakeControlPoints", (PyCFunction) _wrap_PyShape_MakeControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_DeleteControlPoints", (PyCFunction) _wrap_PyShape_DeleteControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ResetControlPoints", (PyCFunction) _wrap_PyShape_ResetControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetEventHandler", (PyCFunction) _wrap_PyShape_GetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetEventHandler", (PyCFunction) _wrap_PyShape_SetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MakeMandatoryControlPoints", (PyCFunction) _wrap_PyShape_MakeMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ResetMandatoryControlPoints", (PyCFunction) _wrap_PyShape_ResetMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Recompute", (PyCFunction) _wrap_PyShape_Recompute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CalculateSize", (PyCFunction) _wrap_PyShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Select", (PyCFunction) _wrap_PyShape_Select, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetHighlight", (PyCFunction) _wrap_PyShape_SetHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_IsHighlighted", (PyCFunction) _wrap_PyShape_IsHighlighted, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Selected", (PyCFunction) _wrap_PyShape_Selected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AncestorSelected", (PyCFunction) _wrap_PyShape_AncestorSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetSensitivityFilter", (PyCFunction) _wrap_PyShape_SetSensitivityFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetSensitivityFilter", (PyCFunction) _wrap_PyShape_GetSensitivityFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDraggable", (PyCFunction) _wrap_PyShape_SetDraggable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetFixedSize", (PyCFunction) _wrap_PyShape_SetFixedSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFixedSize", (PyCFunction) _wrap_PyShape_GetFixedSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFixedWidth", (PyCFunction) _wrap_PyShape_GetFixedWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFixedHeight", (PyCFunction) _wrap_PyShape_GetFixedHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetSpaceAttachments", (PyCFunction) _wrap_PyShape_SetSpaceAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetSpaceAttachments", (PyCFunction) _wrap_PyShape_GetSpaceAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetShadowMode", (PyCFunction) _wrap_PyShape_SetShadowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetShadowMode", (PyCFunction) _wrap_PyShape_GetShadowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_HitTest", (PyCFunction) _wrap_PyShape_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetCentreResize", (PyCFunction) _wrap_PyShape_SetCentreResize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetCentreResize", (PyCFunction) _wrap_PyShape_GetCentreResize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_SetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_GetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetLines", (PyCFunction) _wrap_PyShape_GetLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDisableLabel", (PyCFunction) _wrap_PyShape_SetDisableLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetDisableLabel", (PyCFunction) _wrap_PyShape_GetDisableLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetAttachmentMode", (PyCFunction) _wrap_PyShape_SetAttachmentMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentMode", (PyCFunction) _wrap_PyShape_GetAttachmentMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetId", (PyCFunction) _wrap_PyShape_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetId", (PyCFunction) _wrap_PyShape_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetPen", (PyCFunction) _wrap_PyShape_SetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBrush", (PyCFunction) _wrap_PyShape_SetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Show", (PyCFunction) _wrap_PyShape_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_IsShown", (PyCFunction) _wrap_PyShape_IsShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Move", (PyCFunction) _wrap_PyShape_Move, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Erase", (PyCFunction) _wrap_PyShape_Erase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_EraseContents", (PyCFunction) _wrap_PyShape_EraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Draw", (PyCFunction) _wrap_PyShape_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Flash", (PyCFunction) _wrap_PyShape_Flash, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MoveLinks", (PyCFunction) _wrap_PyShape_MoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_DrawContents", (PyCFunction) _wrap_PyShape_DrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetSize", (PyCFunction) _wrap_PyShape_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetAttachmentSize", (PyCFunction) _wrap_PyShape_SetAttachmentSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Attach", (PyCFunction) _wrap_PyShape_Attach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Detach", (PyCFunction) _wrap_PyShape_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Constrain", (PyCFunction) _wrap_PyShape_Constrain, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddLine", (PyCFunction) _wrap_PyShape_AddLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetLinePosition", (PyCFunction) _wrap_PyShape_GetLinePosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddText", (PyCFunction) _wrap_PyShape_AddText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetPen", (PyCFunction) _wrap_PyShape_GetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBrush", (PyCFunction) _wrap_PyShape_GetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetDefaultRegionSize", (PyCFunction) _wrap_PyShape_SetDefaultRegionSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_FormatText", (PyCFunction) _wrap_PyShape_FormatText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetFormatMode", (PyCFunction) _wrap_PyShape_SetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFormatMode", (PyCFunction) _wrap_PyShape_GetFormatMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetFont", (PyCFunction) _wrap_PyShape_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetFont", (PyCFunction) _wrap_PyShape_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetTextColour", (PyCFunction) _wrap_PyShape_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetTextColour", (PyCFunction) _wrap_PyShape_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetNumberOfTextRegions", (PyCFunction) _wrap_PyShape_GetNumberOfTextRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetRegionName", (PyCFunction) _wrap_PyShape_SetRegionName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRegionName", (PyCFunction) _wrap_PyShape_GetRegionName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRegionId", (PyCFunction) _wrap_PyShape_GetRegionId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_NameRegions", (PyCFunction) _wrap_PyShape_NameRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRegions", (PyCFunction) _wrap_PyShape_GetRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AddRegion", (PyCFunction) _wrap_PyShape_AddRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearRegions", (PyCFunction) _wrap_PyShape_ClearRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AssignNewIds", (PyCFunction) _wrap_PyShape_AssignNewIds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_FindRegion", (PyCFunction) _wrap_PyShape_FindRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_FindRegionNames", (PyCFunction) _wrap_PyShape_FindRegionNames, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearText", (PyCFunction) _wrap_PyShape_ClearText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_RemoveLine", (PyCFunction) _wrap_PyShape_RemoveLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentPosition", (PyCFunction) _wrap_PyShape_GetAttachmentPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetNumberOfAttachments", (PyCFunction) _wrap_PyShape_GetNumberOfAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AttachmentIsValid", (PyCFunction) _wrap_PyShape_AttachmentIsValid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachments", (PyCFunction) _wrap_PyShape_GetAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentPositionEdge", (PyCFunction) _wrap_PyShape_GetAttachmentPositionEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CalcSimpleAttachment", (PyCFunction) _wrap_PyShape_CalcSimpleAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_AttachmentSortTest", (PyCFunction) _wrap_PyShape_AttachmentSortTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_EraseLinks", (PyCFunction) _wrap_PyShape_EraseLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_DrawLinks", (PyCFunction) _wrap_PyShape_DrawLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_MoveLineToNewAttachment", (PyCFunction) _wrap_PyShape_MoveLineToNewAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ApplyAttachmentOrdering", (PyCFunction) _wrap_PyShape_ApplyAttachmentOrdering, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchingAttachmentRoot", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentRoot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchingAttachmentInfo", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchingAttachmentPoint", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetAttachmentLineCount", (PyCFunction) _wrap_PyShape_GetAttachmentLineCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchNeckLength", (PyCFunction) _wrap_PyShape_SetBranchNeckLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchNeckLength", (PyCFunction) _wrap_PyShape_GetBranchNeckLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchStemLength", (PyCFunction) _wrap_PyShape_SetBranchStemLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchStemLength", (PyCFunction) _wrap_PyShape_GetBranchStemLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchSpacing", (PyCFunction) _wrap_PyShape_SetBranchSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchSpacing", (PyCFunction) _wrap_PyShape_GetBranchSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetBranchStyle", (PyCFunction) _wrap_PyShape_SetBranchStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBranchStyle", (PyCFunction) _wrap_PyShape_GetBranchStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_PhysicalToLogicalAttachment", (PyCFunction) _wrap_PyShape_PhysicalToLogicalAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_LogicalToPhysicalAttachment", (PyCFunction) _wrap_PyShape_LogicalToPhysicalAttachment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Draggable", (PyCFunction) _wrap_PyShape_Draggable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_HasDescendant", (PyCFunction) _wrap_PyShape_HasDescendant, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CreateNewCopy", (PyCFunction) _wrap_PyShape_CreateNewCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Copy", (PyCFunction) _wrap_PyShape_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_CopyWithHandler", (PyCFunction) _wrap_PyShape_CopyWithHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Rotate", (PyCFunction) _wrap_PyShape_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetRotation", (PyCFunction) _wrap_PyShape_GetRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_SetRotation", (PyCFunction) _wrap_PyShape_SetRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearAttachments", (PyCFunction) _wrap_PyShape_ClearAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_Recentre", (PyCFunction) _wrap_PyShape_Recentre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_ClearPointList", (PyCFunction) _wrap_PyShape_ClearPointList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBackgroundPen", (PyCFunction) _wrap_PyShape_GetBackgroundPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_GetBackgroundBrush", (PyCFunction) _wrap_PyShape_GetBackgroundBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDelete", (PyCFunction) _wrap_PyShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDraw", (PyCFunction) _wrap_PyShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawContents", (PyCFunction) _wrap_PyShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawBranches", (PyCFunction) _wrap_PyShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMoveLinks", (PyCFunction) _wrap_PyShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnErase", (PyCFunction) _wrap_PyShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEraseContents", (PyCFunction) _wrap_PyShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnHighlight", (PyCFunction) _wrap_PyShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnLeftClick", (PyCFunction) _wrap_PyShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnRightClick", (PyCFunction) _wrap_PyShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSize", (PyCFunction) _wrap_PyShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMovePre", (PyCFunction) _wrap_PyShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMovePost", (PyCFunction) _wrap_PyShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDragLeft", (PyCFunction) _wrap_PyShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDragRight", (PyCFunction) _wrap_PyShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEndDragRight", (PyCFunction) _wrap_PyShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawOutline", (PyCFunction) _wrap_PyShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnMoveLink", (PyCFunction) _wrap_PyShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnBeginSize", (PyCFunction) _wrap_PyShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_base_OnEndSize", (PyCFunction) _wrap_PyShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShape_swigregister", PyShape_swigregister, METH_VARARGS },
-        { (char *)"new_PseudoMetaFile", (PyCFunction) _wrap_new_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PseudoMetaFile", (PyCFunction) _wrap_delete_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Draw", (PyCFunction) _wrap_PseudoMetaFile_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Clear", (PyCFunction) _wrap_PseudoMetaFile_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Copy", (PyCFunction) _wrap_PseudoMetaFile_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Scale", (PyCFunction) _wrap_PseudoMetaFile_Scale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_ScaleTo", (PyCFunction) _wrap_PseudoMetaFile_ScaleTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Translate", (PyCFunction) _wrap_PseudoMetaFile_Translate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_Rotate", (PyCFunction) _wrap_PseudoMetaFile_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_LoadFromMetaFile", (PyCFunction) _wrap_PseudoMetaFile_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetBounds", (PyCFunction) _wrap_PseudoMetaFile_GetBounds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_CalculateSize", (PyCFunction) _wrap_PseudoMetaFile_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetRotateable", (PyCFunction) _wrap_PseudoMetaFile_SetRotateable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetRotateable", (PyCFunction) _wrap_PseudoMetaFile_GetRotateable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetSize", (PyCFunction) _wrap_PseudoMetaFile_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_SetFillBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_GetFillBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_SetOutlinePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_GetOutlinePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_SetOutlineOp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_GetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_GetOutlineOp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_IsValid", (PyCFunction) _wrap_PseudoMetaFile_IsValid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawLine", (PyCFunction) _wrap_PseudoMetaFile_DrawLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawRoundedRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawArc", (PyCFunction) _wrap_PseudoMetaFile_DrawArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawEllipticArc", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawEllipse", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawPoint", (PyCFunction) _wrap_PseudoMetaFile_DrawPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawText", (PyCFunction) _wrap_PseudoMetaFile_DrawText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawLines", (PyCFunction) _wrap_PseudoMetaFile_DrawLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawPolygon", (PyCFunction) _wrap_PseudoMetaFile_DrawPolygon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DrawSpline", (PyCFunction) _wrap_PseudoMetaFile_DrawSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetClippingRect", (PyCFunction) _wrap_PseudoMetaFile_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_DestroyClippingRect", (PyCFunction) _wrap_PseudoMetaFile_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetPen", (PyCFunction) _wrap_PseudoMetaFile_SetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetBrush", (PyCFunction) _wrap_PseudoMetaFile_SetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetFont", (PyCFunction) _wrap_PseudoMetaFile_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetTextColour", (PyCFunction) _wrap_PseudoMetaFile_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetBackgroundColour", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_SetBackgroundMode", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PseudoMetaFile_swigregister", PseudoMetaFile_swigregister, METH_VARARGS },
-        { (char *)"new_PyRectangleShape", (PyCFunction) _wrap_new_PyRectangleShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape__setCallbackInfo", (PyCFunction) _wrap_PyRectangleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_SetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_SetCornerRadius, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_GetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_GetCornerRadius, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDelete", (PyCFunction) _wrap_PyRectangleShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDraw", (PyCFunction) _wrap_PyRectangleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawContents", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnErase", (PyCFunction) _wrap_PyRectangleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEraseContents", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnHighlight", (PyCFunction) _wrap_PyRectangleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnLeftClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnRightClick", (PyCFunction) _wrap_PyRectangleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSize", (PyCFunction) _wrap_PyRectangleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMovePre", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMovePost", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnMoveLink", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnBeginSize", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_base_OnEndSize", (PyCFunction) _wrap_PyRectangleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyRectangleShape_swigregister", PyRectangleShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyControlPoint", (PyCFunction) _wrap_new_PyControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint__setCallbackInfo", (PyCFunction) _wrap_PyControlPoint__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_SetCornerRadius", (PyCFunction) _wrap_PyControlPoint_SetCornerRadius, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDelete", (PyCFunction) _wrap_PyControlPoint_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDraw", (PyCFunction) _wrap_PyControlPoint_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawContents", (PyCFunction) _wrap_PyControlPoint_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawBranches", (PyCFunction) _wrap_PyControlPoint_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMoveLinks", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnErase", (PyCFunction) _wrap_PyControlPoint_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEraseContents", (PyCFunction) _wrap_PyControlPoint_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnHighlight", (PyCFunction) _wrap_PyControlPoint_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnLeftClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnRightClick", (PyCFunction) _wrap_PyControlPoint_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSize", (PyCFunction) _wrap_PyControlPoint_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMovePre", (PyCFunction) _wrap_PyControlPoint_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMovePost", (PyCFunction) _wrap_PyControlPoint_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnBeginDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEndDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawOutline", (PyCFunction) _wrap_PyControlPoint_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnDrawControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEraseControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnMoveLink", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSizingDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnBeginSize", (PyCFunction) _wrap_PyControlPoint_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_base_OnEndSize", (PyCFunction) _wrap_PyControlPoint_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControlPoint_swigregister", PyControlPoint_swigregister, METH_VARARGS },
-        { (char *)"new_PyBitmapShape", (PyCFunction) _wrap_new_PyBitmapShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape__setCallbackInfo", (PyCFunction) _wrap_PyBitmapShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_GetBitmap", (PyCFunction) _wrap_PyBitmapShape_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_GetFilename", (PyCFunction) _wrap_PyBitmapShape_GetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_SetBitmap", (PyCFunction) _wrap_PyBitmapShape_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_SetFilename", (PyCFunction) _wrap_PyBitmapShape_SetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDelete", (PyCFunction) _wrap_PyBitmapShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDraw", (PyCFunction) _wrap_PyBitmapShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawContents", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawBranches", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMoveLinks", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnErase", (PyCFunction) _wrap_PyBitmapShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEraseContents", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnHighlight", (PyCFunction) _wrap_PyBitmapShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnLeftClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnRightClick", (PyCFunction) _wrap_PyBitmapShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSize", (PyCFunction) _wrap_PyBitmapShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMovePre", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMovePost", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEndDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawOutline", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnMoveLink", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnBeginSize", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_base_OnEndSize", (PyCFunction) _wrap_PyBitmapShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapShape_swigregister", PyBitmapShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyDrawnShape", (PyCFunction) _wrap_new_PyDrawnShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape__setCallbackInfo", (PyCFunction) _wrap_PyDrawnShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_CalculateSize", (PyCFunction) _wrap_PyDrawnShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DestroyClippingRect", (PyCFunction) _wrap_PyDrawnShape_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawArc", (PyCFunction) _wrap_PyDrawnShape_DrawArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawAtAngle", (PyCFunction) _wrap_PyDrawnShape_DrawAtAngle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawEllipticArc", (PyCFunction) _wrap_PyDrawnShape_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawLine", (PyCFunction) _wrap_PyDrawnShape_DrawLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawLines", (PyCFunction) _wrap_PyDrawnShape_DrawLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawPoint", (PyCFunction) _wrap_PyDrawnShape_DrawPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawPolygon", (PyCFunction) _wrap_PyDrawnShape_DrawPolygon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawRoundedRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawSpline", (PyCFunction) _wrap_PyDrawnShape_DrawSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_DrawText", (PyCFunction) _wrap_PyDrawnShape_DrawText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_GetAngle", (PyCFunction) _wrap_PyDrawnShape_GetAngle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_GetMetaFile", (PyCFunction) _wrap_PyDrawnShape_GetMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_GetRotation", (PyCFunction) _wrap_PyDrawnShape_GetRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_LoadFromMetaFile", (PyCFunction) _wrap_PyDrawnShape_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_Rotate", (PyCFunction) _wrap_PyDrawnShape_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetClippingRect", (PyCFunction) _wrap_PyDrawnShape_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnBackgroundColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnBackgroundMode", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnBrush", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnFont", (PyCFunction) _wrap_PyDrawnShape_SetDrawnFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnPen", (PyCFunction) _wrap_PyDrawnShape_SetDrawnPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetDrawnTextColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_Scale", (PyCFunction) _wrap_PyDrawnShape_Scale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_SetSaveToFile", (PyCFunction) _wrap_PyDrawnShape_SetSaveToFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_Translate", (PyCFunction) _wrap_PyDrawnShape_Translate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDelete", (PyCFunction) _wrap_PyDrawnShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDraw", (PyCFunction) _wrap_PyDrawnShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawContents", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnErase", (PyCFunction) _wrap_PyDrawnShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEraseContents", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnHighlight", (PyCFunction) _wrap_PyDrawnShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnLeftClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnRightClick", (PyCFunction) _wrap_PyDrawnShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSize", (PyCFunction) _wrap_PyDrawnShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMovePre", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMovePost", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnMoveLink", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnBeginSize", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_base_OnEndSize", (PyCFunction) _wrap_PyDrawnShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDrawnShape_swigregister", PyDrawnShape_swigregister, METH_VARARGS },
-        { (char *)"new_OGLConstraint", (PyCFunction) _wrap_new_OGLConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_Evaluate", (PyCFunction) _wrap_OGLConstraint_Evaluate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_SetSpacing", (PyCFunction) _wrap_OGLConstraint_SetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_Equals", (PyCFunction) _wrap_OGLConstraint_Equals, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLConstraint_swigregister", OGLConstraint_swigregister, METH_VARARGS },
-        { (char *)"new_PyCompositeShape", (PyCFunction) _wrap_new_PyCompositeShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape__setCallbackInfo", (PyCFunction) _wrap_PyCompositeShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddChild", (PyCFunction) _wrap_PyCompositeShape_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddConstraint", (PyCFunction) _wrap_PyCompositeShape_AddConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddConstrainedShapes", (PyCFunction) _wrap_PyCompositeShape_AddConstrainedShapes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_AddSimpleConstraint", (PyCFunction) _wrap_PyCompositeShape_AddSimpleConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_CalculateSize", (PyCFunction) _wrap_PyCompositeShape_CalculateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_ContainsDivision", (PyCFunction) _wrap_PyCompositeShape_ContainsDivision, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_DeleteConstraint", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_DeleteConstraintsInvolvingChild", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraintsInvolvingChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_FindContainerImage", (PyCFunction) _wrap_PyCompositeShape_FindContainerImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_GetConstraints", (PyCFunction) _wrap_PyCompositeShape_GetConstraints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_GetDivisions", (PyCFunction) _wrap_PyCompositeShape_GetDivisions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_MakeContainer", (PyCFunction) _wrap_PyCompositeShape_MakeContainer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_Recompute", (PyCFunction) _wrap_PyCompositeShape_Recompute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_RemoveChild", (PyCFunction) _wrap_PyCompositeShape_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDelete", (PyCFunction) _wrap_PyCompositeShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDraw", (PyCFunction) _wrap_PyCompositeShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawContents", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnErase", (PyCFunction) _wrap_PyCompositeShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEraseContents", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnHighlight", (PyCFunction) _wrap_PyCompositeShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnLeftClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnRightClick", (PyCFunction) _wrap_PyCompositeShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSize", (PyCFunction) _wrap_PyCompositeShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMovePre", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMovePost", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnMoveLink", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnBeginSize", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_base_OnEndSize", (PyCFunction) _wrap_PyCompositeShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCompositeShape_swigregister", PyCompositeShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyDividedShape", (PyCFunction) _wrap_new_PyDividedShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape__setCallbackInfo", (PyCFunction) _wrap_PyDividedShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_EditRegions", (PyCFunction) _wrap_PyDividedShape_EditRegions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_SetRegionSizes", (PyCFunction) _wrap_PyDividedShape_SetRegionSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDelete", (PyCFunction) _wrap_PyDividedShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDraw", (PyCFunction) _wrap_PyDividedShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawContents", (PyCFunction) _wrap_PyDividedShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDividedShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnErase", (PyCFunction) _wrap_PyDividedShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEraseContents", (PyCFunction) _wrap_PyDividedShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnHighlight", (PyCFunction) _wrap_PyDividedShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnLeftClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnRightClick", (PyCFunction) _wrap_PyDividedShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSize", (PyCFunction) _wrap_PyDividedShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMovePre", (PyCFunction) _wrap_PyDividedShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMovePost", (PyCFunction) _wrap_PyDividedShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDividedShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnMoveLink", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnBeginSize", (PyCFunction) _wrap_PyDividedShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_base_OnEndSize", (PyCFunction) _wrap_PyDividedShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDividedShape_swigregister", PyDividedShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyDivisionShape", (PyCFunction) _wrap_new_PyDivisionShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape__setCallbackInfo", (PyCFunction) _wrap_PyDivisionShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustBottom", (PyCFunction) _wrap_PyDivisionShape_AdjustBottom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustLeft", (PyCFunction) _wrap_PyDivisionShape_AdjustLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustRight", (PyCFunction) _wrap_PyDivisionShape_AdjustRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_AdjustTop", (PyCFunction) _wrap_PyDivisionShape_AdjustTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_Divide", (PyCFunction) _wrap_PyDivisionShape_Divide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_EditEdge", (PyCFunction) _wrap_PyDivisionShape_EditEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetBottomSide", (PyCFunction) _wrap_PyDivisionShape_GetBottomSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetHandleSide", (PyCFunction) _wrap_PyDivisionShape_GetHandleSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetLeftSide", (PyCFunction) _wrap_PyDivisionShape_GetLeftSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_GetLeftSideColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_GetLeftSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetRightSide", (PyCFunction) _wrap_PyDivisionShape_GetRightSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetTopSide", (PyCFunction) _wrap_PyDivisionShape_GetTopSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_GetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_GetTopSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_ResizeAdjoining", (PyCFunction) _wrap_PyDivisionShape_ResizeAdjoining, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_PopupMenu", (PyCFunction) _wrap_PyDivisionShape_PopupMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetBottomSide", (PyCFunction) _wrap_PyDivisionShape_SetBottomSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetHandleSide", (PyCFunction) _wrap_PyDivisionShape_SetHandleSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetLeftSide", (PyCFunction) _wrap_PyDivisionShape_SetLeftSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_SetLeftSideColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_SetLeftSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetRightSide", (PyCFunction) _wrap_PyDivisionShape_SetRightSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetTopSide", (PyCFunction) _wrap_PyDivisionShape_SetTopSide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetTopSideColour", (PyCFunction) _wrap_PyDivisionShape_SetTopSideColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_SetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_SetTopSidePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDelete", (PyCFunction) _wrap_PyDivisionShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDraw", (PyCFunction) _wrap_PyDivisionShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawContents", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnErase", (PyCFunction) _wrap_PyDivisionShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEraseContents", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnHighlight", (PyCFunction) _wrap_PyDivisionShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnLeftClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnRightClick", (PyCFunction) _wrap_PyDivisionShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSize", (PyCFunction) _wrap_PyDivisionShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMovePre", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMovePost", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnMoveLink", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnBeginSize", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_base_OnEndSize", (PyCFunction) _wrap_PyDivisionShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDivisionShape_swigregister", PyDivisionShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyEllipseShape", (PyCFunction) _wrap_new_PyEllipseShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape__setCallbackInfo", (PyCFunction) _wrap_PyEllipseShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDraw", (PyCFunction) _wrap_PyEllipseShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawContents", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawBranches", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMoveLinks", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnErase", (PyCFunction) _wrap_PyEllipseShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEraseContents", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnHighlight", (PyCFunction) _wrap_PyEllipseShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnLeftClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnRightClick", (PyCFunction) _wrap_PyEllipseShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSize", (PyCFunction) _wrap_PyEllipseShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMovePre", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMovePost", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEndDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawOutline", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnMoveLink", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnBeginSize", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_base_OnEndSize", (PyCFunction) _wrap_PyEllipseShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEllipseShape_swigregister", PyEllipseShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyCircleShape", (PyCFunction) _wrap_new_PyCircleShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape__setCallbackInfo", (PyCFunction) _wrap_PyCircleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDraw", (PyCFunction) _wrap_PyCircleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawContents", (PyCFunction) _wrap_PyCircleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCircleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnErase", (PyCFunction) _wrap_PyCircleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEraseContents", (PyCFunction) _wrap_PyCircleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnHighlight", (PyCFunction) _wrap_PyCircleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnLeftClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnRightClick", (PyCFunction) _wrap_PyCircleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSize", (PyCFunction) _wrap_PyCircleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMovePre", (PyCFunction) _wrap_PyCircleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMovePost", (PyCFunction) _wrap_PyCircleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCircleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnMoveLink", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnBeginSize", (PyCFunction) _wrap_PyCircleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_base_OnEndSize", (PyCFunction) _wrap_PyCircleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCircleShape_swigregister", PyCircleShape_swigregister, METH_VARARGS },
-        { (char *)"new_ArrowHead", (PyCFunction) _wrap_new_ArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ArrowHead", (PyCFunction) _wrap_delete_ArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead__GetType", (PyCFunction) _wrap_ArrowHead__GetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetPosition", (PyCFunction) _wrap_ArrowHead_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetPosition", (PyCFunction) _wrap_ArrowHead_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetXOffset", (PyCFunction) _wrap_ArrowHead_GetXOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetYOffset", (PyCFunction) _wrap_ArrowHead_GetYOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetSpacing", (PyCFunction) _wrap_ArrowHead_GetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetSize", (PyCFunction) _wrap_ArrowHead_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetName", (PyCFunction) _wrap_ArrowHead_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetXOffset", (PyCFunction) _wrap_ArrowHead_SetXOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetYOffset", (PyCFunction) _wrap_ArrowHead_SetYOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetMetaFile", (PyCFunction) _wrap_ArrowHead_GetMetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetId", (PyCFunction) _wrap_ArrowHead_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetArrowEnd", (PyCFunction) _wrap_ArrowHead_GetArrowEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_GetArrowSize", (PyCFunction) _wrap_ArrowHead_GetArrowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetSize", (PyCFunction) _wrap_ArrowHead_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_SetSpacing", (PyCFunction) _wrap_ArrowHead_SetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArrowHead_swigregister", ArrowHead_swigregister, METH_VARARGS },
-        { (char *)"new_PyLineShape", (PyCFunction) _wrap_new_PyLineShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape__setCallbackInfo", (PyCFunction) _wrap_PyLineShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_AddArrow", (PyCFunction) _wrap_PyLineShape_AddArrow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_AddArrowOrdered", (PyCFunction) _wrap_PyLineShape_AddArrowOrdered, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_ClearArrow", (PyCFunction) _wrap_PyLineShape_ClearArrow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_ClearArrowsAtPosition", (PyCFunction) _wrap_PyLineShape_ClearArrowsAtPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DrawArrow", (PyCFunction) _wrap_PyLineShape_DrawArrow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DeleteArrowHeadId", (PyCFunction) _wrap_PyLineShape_DeleteArrowHeadId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DeleteArrowHead", (PyCFunction) _wrap_PyLineShape_DeleteArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DeleteLineControlPoint", (PyCFunction) _wrap_PyLineShape_DeleteLineControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DrawArrows", (PyCFunction) _wrap_PyLineShape_DrawArrows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_DrawRegion", (PyCFunction) _wrap_PyLineShape_DrawRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_EraseRegion", (PyCFunction) _wrap_PyLineShape_EraseRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindArrowHeadId", (PyCFunction) _wrap_PyLineShape_FindArrowHeadId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindArrowHead", (PyCFunction) _wrap_PyLineShape_FindArrowHead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindLineEndPoints", (PyCFunction) _wrap_PyLineShape_FindLineEndPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindLinePosition", (PyCFunction) _wrap_PyLineShape_FindLinePosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindMinimumWidth", (PyCFunction) _wrap_PyLineShape_FindMinimumWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_FindNth", (PyCFunction) _wrap_PyLineShape_FindNth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_GetAttachmentFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAttachmentTo", (PyCFunction) _wrap_PyLineShape_GetAttachmentTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetEnds", (PyCFunction) _wrap_PyLineShape_GetEnds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetFrom", (PyCFunction) _wrap_PyLineShape_GetFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetLabelPosition", (PyCFunction) _wrap_PyLineShape_GetLabelPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetNextControlPoint", (PyCFunction) _wrap_PyLineShape_GetNextControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetTo", (PyCFunction) _wrap_PyLineShape_GetTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_Initialise", (PyCFunction) _wrap_PyLineShape_Initialise, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_InsertLineControlPoint", (PyCFunction) _wrap_PyLineShape_InsertLineControlPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_IsEnd", (PyCFunction) _wrap_PyLineShape_IsEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetEnds", (PyCFunction) _wrap_PyLineShape_SetEnds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetFrom", (PyCFunction) _wrap_PyLineShape_SetFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetIgnoreOffsets", (PyCFunction) _wrap_PyLineShape_SetIgnoreOffsets, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetSpline", (PyCFunction) _wrap_PyLineShape_SetSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetTo", (PyCFunction) _wrap_PyLineShape_SetTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_Straighten", (PyCFunction) _wrap_PyLineShape_Straighten, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_Unlink", (PyCFunction) _wrap_PyLineShape_Unlink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_SetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_SetAlignmentType", (PyCFunction) _wrap_PyLineShape_SetAlignmentType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_GetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentType", (PyCFunction) _wrap_PyLineShape_GetAlignmentType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentStart", (PyCFunction) _wrap_PyLineShape_GetAlignmentStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_GetAlignmentEnd", (PyCFunction) _wrap_PyLineShape_GetAlignmentEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDraw", (PyCFunction) _wrap_PyLineShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawContents", (PyCFunction) _wrap_PyLineShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawBranches", (PyCFunction) _wrap_PyLineShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMoveLinks", (PyCFunction) _wrap_PyLineShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnErase", (PyCFunction) _wrap_PyLineShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEraseContents", (PyCFunction) _wrap_PyLineShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnHighlight", (PyCFunction) _wrap_PyLineShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnLeftClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnRightClick", (PyCFunction) _wrap_PyLineShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSize", (PyCFunction) _wrap_PyLineShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMovePre", (PyCFunction) _wrap_PyLineShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMovePost", (PyCFunction) _wrap_PyLineShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDragRight", (PyCFunction) _wrap_PyLineShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEndDragRight", (PyCFunction) _wrap_PyLineShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawOutline", (PyCFunction) _wrap_PyLineShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnMoveLink", (PyCFunction) _wrap_PyLineShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnBeginSize", (PyCFunction) _wrap_PyLineShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_base_OnEndSize", (PyCFunction) _wrap_PyLineShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLineShape_swigregister", PyLineShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyPolygonShape", (PyCFunction) _wrap_new_PyPolygonShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape__setCallbackInfo", (PyCFunction) _wrap_PyPolygonShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_Create", (PyCFunction) _wrap_PyPolygonShape_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_AddPolygonPoint", (PyCFunction) _wrap_PyPolygonShape_AddPolygonPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_CalculatePolygonCentre", (PyCFunction) _wrap_PyPolygonShape_CalculatePolygonCentre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_DeletePolygonPoint", (PyCFunction) _wrap_PyPolygonShape_DeletePolygonPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetPoints", (PyCFunction) _wrap_PyPolygonShape_GetPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_GetOriginalPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_GetOriginalWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_GetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_GetOriginalHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_SetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_SetOriginalWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_SetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_SetOriginalHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_UpdateOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_UpdateOriginalPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDraw", (PyCFunction) _wrap_PyPolygonShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawContents", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawBranches", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMoveLinks", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnErase", (PyCFunction) _wrap_PyPolygonShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEraseContents", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnHighlight", (PyCFunction) _wrap_PyPolygonShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnLeftClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnRightClick", (PyCFunction) _wrap_PyPolygonShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSize", (PyCFunction) _wrap_PyPolygonShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMovePre", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMovePost", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEndDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawOutline", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnMoveLink", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnBeginSize", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_base_OnEndSize", (PyCFunction) _wrap_PyPolygonShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPolygonShape_swigregister", PyPolygonShape_swigregister, METH_VARARGS },
-        { (char *)"new_PyTextShape", (PyCFunction) _wrap_new_PyTextShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape__setCallbackInfo", (PyCFunction) _wrap_PyTextShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDelete", (PyCFunction) _wrap_PyTextShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDraw", (PyCFunction) _wrap_PyTextShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawContents", (PyCFunction) _wrap_PyTextShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawBranches", (PyCFunction) _wrap_PyTextShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMoveLinks", (PyCFunction) _wrap_PyTextShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnErase", (PyCFunction) _wrap_PyTextShape_base_OnErase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEraseContents", (PyCFunction) _wrap_PyTextShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnHighlight", (PyCFunction) _wrap_PyTextShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnLeftClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnRightClick", (PyCFunction) _wrap_PyTextShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSize", (PyCFunction) _wrap_PyTextShape_base_OnSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMovePre", (PyCFunction) _wrap_PyTextShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMovePost", (PyCFunction) _wrap_PyTextShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDragRight", (PyCFunction) _wrap_PyTextShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEndDragRight", (PyCFunction) _wrap_PyTextShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawOutline", (PyCFunction) _wrap_PyTextShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnMoveLink", (PyCFunction) _wrap_PyTextShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnBeginSize", (PyCFunction) _wrap_PyTextShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_base_OnEndSize", (PyCFunction) _wrap_PyTextShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextShape_swigregister", PyTextShape_swigregister, METH_VARARGS },
-        { (char *)"new_Diagram", (PyCFunction) _wrap_new_Diagram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_AddShape", (PyCFunction) _wrap_Diagram_AddShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_Clear", (PyCFunction) _wrap_Diagram_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_DeleteAllShapes", (PyCFunction) _wrap_Diagram_DeleteAllShapes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_DrawOutline", (PyCFunction) _wrap_Diagram_DrawOutline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_FindShape", (PyCFunction) _wrap_Diagram_FindShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetCanvas", (PyCFunction) _wrap_Diagram_GetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetCount", (PyCFunction) _wrap_Diagram_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetGridSpacing", (PyCFunction) _wrap_Diagram_GetGridSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetMouseTolerance", (PyCFunction) _wrap_Diagram_GetMouseTolerance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetShapeList", (PyCFunction) _wrap_Diagram_GetShapeList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetQuickEditMode", (PyCFunction) _wrap_Diagram_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_GetSnapToGrid", (PyCFunction) _wrap_Diagram_GetSnapToGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_InsertShape", (PyCFunction) _wrap_Diagram_InsertShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_RecentreAll", (PyCFunction) _wrap_Diagram_RecentreAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_Redraw", (PyCFunction) _wrap_Diagram_Redraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_RemoveAllShapes", (PyCFunction) _wrap_Diagram_RemoveAllShapes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_RemoveShape", (PyCFunction) _wrap_Diagram_RemoveShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetCanvas", (PyCFunction) _wrap_Diagram_SetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetGridSpacing", (PyCFunction) _wrap_Diagram_SetGridSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetMouseTolerance", (PyCFunction) _wrap_Diagram_SetMouseTolerance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetQuickEditMode", (PyCFunction) _wrap_Diagram_SetQuickEditMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_SetSnapToGrid", (PyCFunction) _wrap_Diagram_SetSnapToGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_ShowAll", (PyCFunction) _wrap_Diagram_ShowAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_Snap", (PyCFunction) _wrap_Diagram_Snap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Diagram_swigregister", Diagram_swigregister, METH_VARARGS },
-        { (char *)"new_PyShapeCanvas", (PyCFunction) _wrap_new_PyShapeCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas__setCallbackInfo", (PyCFunction) _wrap_PyShapeCanvas__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_AddShape", (PyCFunction) _wrap_PyShapeCanvas_AddShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_FindShape", (PyCFunction) _wrap_PyShapeCanvas_FindShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_FindFirstSensitiveShape", (PyCFunction) _wrap_PyShapeCanvas_FindFirstSensitiveShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_GetDiagram", (PyCFunction) _wrap_PyShapeCanvas_GetDiagram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_GetQuickEditMode", (PyCFunction) _wrap_PyShapeCanvas_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_InsertShape", (PyCFunction) _wrap_PyShapeCanvas_InsertShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnLeftClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_base_OnRightClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnRightClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_Redraw", (PyCFunction) _wrap_PyShapeCanvas_Redraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_RemoveShape", (PyCFunction) _wrap_PyShapeCanvas_RemoveShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_SetDiagram", (PyCFunction) _wrap_PyShapeCanvas_SetDiagram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_Snap", (PyCFunction) _wrap_PyShapeCanvas_Snap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyShapeCanvas_swigregister", PyShapeCanvas_swigregister, METH_VARARGS },
-        { (char *)"OGLInitialize", (PyCFunction) _wrap_OGLInitialize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OGLCleanUp", (PyCFunction) _wrap_OGLCleanUp, METH_VARARGS | METH_KEYWORDS },
-        { NULL, NULL }
+        { (char *)"new_ShapeRegion", (PyCFunction) _wrap_new_ShapeRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetText", (PyCFunction) _wrap_ShapeRegion_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetFont", (PyCFunction) _wrap_ShapeRegion_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetMinSize", (PyCFunction) _wrap_ShapeRegion_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetSize", (PyCFunction) _wrap_ShapeRegion_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetPosition", (PyCFunction) _wrap_ShapeRegion_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetProportions", (PyCFunction) _wrap_ShapeRegion_SetProportions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetFormatMode", (PyCFunction) _wrap_ShapeRegion_SetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetName", (PyCFunction) _wrap_ShapeRegion_SetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetColour", (PyCFunction) _wrap_ShapeRegion_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetText", (PyCFunction) _wrap_ShapeRegion_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetFont", (PyCFunction) _wrap_ShapeRegion_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetMinSize", (PyCFunction) _wrap_ShapeRegion_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetProportion", (PyCFunction) _wrap_ShapeRegion_GetProportion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetSize", (PyCFunction) _wrap_ShapeRegion_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetPosition", (PyCFunction) _wrap_ShapeRegion_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetFormatMode", (PyCFunction) _wrap_ShapeRegion_GetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetName", (PyCFunction) _wrap_ShapeRegion_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetColour", (PyCFunction) _wrap_ShapeRegion_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetActualColourObject", (PyCFunction) _wrap_ShapeRegion_GetActualColourObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetFormattedText", (PyCFunction) _wrap_ShapeRegion_GetFormattedText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetPenColour", (PyCFunction) _wrap_ShapeRegion_GetPenColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetPenStyle", (PyCFunction) _wrap_ShapeRegion_GetPenStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetPenStyle", (PyCFunction) _wrap_ShapeRegion_SetPenStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_SetPenColour", (PyCFunction) _wrap_ShapeRegion_SetPenColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetActualPen", (PyCFunction) _wrap_ShapeRegion_GetActualPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetWidth", (PyCFunction) _wrap_ShapeRegion_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_GetHeight", (PyCFunction) _wrap_ShapeRegion_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_ClearText", (PyCFunction) _wrap_ShapeRegion_ClearText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShapeRegion_swigregister", ShapeRegion_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_AttachmentPoint", (PyCFunction) _wrap_new_AttachmentPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_m_id_set", (PyCFunction) _wrap_AttachmentPoint_m_id_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_m_id_get", (PyCFunction) _wrap_AttachmentPoint_m_id_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_m_x_set", (PyCFunction) _wrap_AttachmentPoint_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_m_x_get", (PyCFunction) _wrap_AttachmentPoint_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_m_y_set", (PyCFunction) _wrap_AttachmentPoint_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_m_y_get", (PyCFunction) _wrap_AttachmentPoint_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AttachmentPoint_swigregister", AttachmentPoint_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyShapeEvtHandler", (PyCFunction) _wrap_new_PyShapeEvtHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler__setCallbackInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler__setOORInfo", (PyCFunction) _wrap_PyShapeEvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_SetShape", (PyCFunction) _wrap_PyShapeEvtHandler_SetShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_GetShape", (PyCFunction) _wrap_PyShapeEvtHandler_GetShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_SetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_GetPreviousHandler", (PyCFunction) _wrap_PyShapeEvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_CreateNewCopy", (PyCFunction) _wrap_PyShapeEvtHandler_CreateNewCopy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDelete", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDraw", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDrawContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDrawBranches", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnMoveLinks", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnErase", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnEraseContents", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnHighlight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnLeftClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnRightClick", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnMovePre", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnMovePost", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDrawOutline", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnMoveLink", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnBeginSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_base_OnEndSize", (PyCFunction) _wrap_PyShapeEvtHandler_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeEvtHandler_swigregister", PyShapeEvtHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyShape", (PyCFunction) _wrap_new_PyShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape__setCallbackInfo", (PyCFunction) _wrap_PyShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBoundingBoxMax", (PyCFunction) _wrap_PyShape_GetBoundingBoxMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBoundingBoxMin", (PyCFunction) _wrap_PyShape_GetBoundingBoxMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetPerimeterPoint", (PyCFunction) _wrap_PyShape_GetPerimeterPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetCanvas", (PyCFunction) _wrap_PyShape_GetCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetCanvas", (PyCFunction) _wrap_PyShape_SetCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AddToCanvas", (PyCFunction) _wrap_PyShape_AddToCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_InsertInCanvas", (PyCFunction) _wrap_PyShape_InsertInCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_RemoveFromCanvas", (PyCFunction) _wrap_PyShape_RemoveFromCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetX", (PyCFunction) _wrap_PyShape_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetY", (PyCFunction) _wrap_PyShape_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetX", (PyCFunction) _wrap_PyShape_SetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetY", (PyCFunction) _wrap_PyShape_SetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetParent", (PyCFunction) _wrap_PyShape_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetParent", (PyCFunction) _wrap_PyShape_SetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetTopAncestor", (PyCFunction) _wrap_PyShape_GetTopAncestor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetChildren", (PyCFunction) _wrap_PyShape_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Unlink", (PyCFunction) _wrap_PyShape_Unlink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetDrawHandles", (PyCFunction) _wrap_PyShape_SetDrawHandles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetDrawHandles", (PyCFunction) _wrap_PyShape_GetDrawHandles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_MakeControlPoints", (PyCFunction) _wrap_PyShape_MakeControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_DeleteControlPoints", (PyCFunction) _wrap_PyShape_DeleteControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ResetControlPoints", (PyCFunction) _wrap_PyShape_ResetControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetEventHandler", (PyCFunction) _wrap_PyShape_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetEventHandler", (PyCFunction) _wrap_PyShape_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_MakeMandatoryControlPoints", (PyCFunction) _wrap_PyShape_MakeMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ResetMandatoryControlPoints", (PyCFunction) _wrap_PyShape_ResetMandatoryControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Recompute", (PyCFunction) _wrap_PyShape_Recompute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_CalculateSize", (PyCFunction) _wrap_PyShape_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Select", (PyCFunction) _wrap_PyShape_Select, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetHighlight", (PyCFunction) _wrap_PyShape_SetHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_IsHighlighted", (PyCFunction) _wrap_PyShape_IsHighlighted, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Selected", (PyCFunction) _wrap_PyShape_Selected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AncestorSelected", (PyCFunction) _wrap_PyShape_AncestorSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetSensitivityFilter", (PyCFunction) _wrap_PyShape_SetSensitivityFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetSensitivityFilter", (PyCFunction) _wrap_PyShape_GetSensitivityFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetDraggable", (PyCFunction) _wrap_PyShape_SetDraggable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetFixedSize", (PyCFunction) _wrap_PyShape_SetFixedSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetFixedSize", (PyCFunction) _wrap_PyShape_GetFixedSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetFixedWidth", (PyCFunction) _wrap_PyShape_GetFixedWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetFixedHeight", (PyCFunction) _wrap_PyShape_GetFixedHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetSpaceAttachments", (PyCFunction) _wrap_PyShape_SetSpaceAttachments, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetSpaceAttachments", (PyCFunction) _wrap_PyShape_GetSpaceAttachments, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetShadowMode", (PyCFunction) _wrap_PyShape_SetShadowMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetShadowMode", (PyCFunction) _wrap_PyShape_GetShadowMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_HitTest", (PyCFunction) _wrap_PyShape_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetCentreResize", (PyCFunction) _wrap_PyShape_SetCentreResize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetCentreResize", (PyCFunction) _wrap_PyShape_GetCentreResize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_SetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetMaintainAspectRatio", (PyCFunction) _wrap_PyShape_GetMaintainAspectRatio, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetLines", (PyCFunction) _wrap_PyShape_GetLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetDisableLabel", (PyCFunction) _wrap_PyShape_SetDisableLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetDisableLabel", (PyCFunction) _wrap_PyShape_GetDisableLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetAttachmentMode", (PyCFunction) _wrap_PyShape_SetAttachmentMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetAttachmentMode", (PyCFunction) _wrap_PyShape_GetAttachmentMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetId", (PyCFunction) _wrap_PyShape_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetId", (PyCFunction) _wrap_PyShape_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetPen", (PyCFunction) _wrap_PyShape_SetPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetBrush", (PyCFunction) _wrap_PyShape_SetBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Show", (PyCFunction) _wrap_PyShape_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_IsShown", (PyCFunction) _wrap_PyShape_IsShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Move", (PyCFunction) _wrap_PyShape_Move, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Erase", (PyCFunction) _wrap_PyShape_Erase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_EraseContents", (PyCFunction) _wrap_PyShape_EraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Draw", (PyCFunction) _wrap_PyShape_Draw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Flash", (PyCFunction) _wrap_PyShape_Flash, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_MoveLinks", (PyCFunction) _wrap_PyShape_MoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_DrawContents", (PyCFunction) _wrap_PyShape_DrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetSize", (PyCFunction) _wrap_PyShape_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetAttachmentSize", (PyCFunction) _wrap_PyShape_SetAttachmentSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Attach", (PyCFunction) _wrap_PyShape_Attach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Detach", (PyCFunction) _wrap_PyShape_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Constrain", (PyCFunction) _wrap_PyShape_Constrain, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AddLine", (PyCFunction) _wrap_PyShape_AddLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetLinePosition", (PyCFunction) _wrap_PyShape_GetLinePosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AddText", (PyCFunction) _wrap_PyShape_AddText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetPen", (PyCFunction) _wrap_PyShape_GetPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBrush", (PyCFunction) _wrap_PyShape_GetBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetDefaultRegionSize", (PyCFunction) _wrap_PyShape_SetDefaultRegionSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_FormatText", (PyCFunction) _wrap_PyShape_FormatText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetFormatMode", (PyCFunction) _wrap_PyShape_SetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetFormatMode", (PyCFunction) _wrap_PyShape_GetFormatMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetFont", (PyCFunction) _wrap_PyShape_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetFont", (PyCFunction) _wrap_PyShape_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetTextColour", (PyCFunction) _wrap_PyShape_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetTextColour", (PyCFunction) _wrap_PyShape_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetNumberOfTextRegions", (PyCFunction) _wrap_PyShape_GetNumberOfTextRegions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetRegionName", (PyCFunction) _wrap_PyShape_SetRegionName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetRegionName", (PyCFunction) _wrap_PyShape_GetRegionName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetRegionId", (PyCFunction) _wrap_PyShape_GetRegionId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_NameRegions", (PyCFunction) _wrap_PyShape_NameRegions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetRegions", (PyCFunction) _wrap_PyShape_GetRegions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AddRegion", (PyCFunction) _wrap_PyShape_AddRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ClearRegions", (PyCFunction) _wrap_PyShape_ClearRegions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AssignNewIds", (PyCFunction) _wrap_PyShape_AssignNewIds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_FindRegion", (PyCFunction) _wrap_PyShape_FindRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_FindRegionNames", (PyCFunction) _wrap_PyShape_FindRegionNames, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ClearText", (PyCFunction) _wrap_PyShape_ClearText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_RemoveLine", (PyCFunction) _wrap_PyShape_RemoveLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetAttachmentPosition", (PyCFunction) _wrap_PyShape_GetAttachmentPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetNumberOfAttachments", (PyCFunction) _wrap_PyShape_GetNumberOfAttachments, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AttachmentIsValid", (PyCFunction) _wrap_PyShape_AttachmentIsValid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetAttachments", (PyCFunction) _wrap_PyShape_GetAttachments, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetAttachmentPositionEdge", (PyCFunction) _wrap_PyShape_GetAttachmentPositionEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_CalcSimpleAttachment", (PyCFunction) _wrap_PyShape_CalcSimpleAttachment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_AttachmentSortTest", (PyCFunction) _wrap_PyShape_AttachmentSortTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_EraseLinks", (PyCFunction) _wrap_PyShape_EraseLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_DrawLinks", (PyCFunction) _wrap_PyShape_DrawLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_MoveLineToNewAttachment", (PyCFunction) _wrap_PyShape_MoveLineToNewAttachment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ApplyAttachmentOrdering", (PyCFunction) _wrap_PyShape_ApplyAttachmentOrdering, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchingAttachmentRoot", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentRoot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchingAttachmentInfo", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchingAttachmentPoint", (PyCFunction) _wrap_PyShape_GetBranchingAttachmentPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetAttachmentLineCount", (PyCFunction) _wrap_PyShape_GetAttachmentLineCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetBranchNeckLength", (PyCFunction) _wrap_PyShape_SetBranchNeckLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchNeckLength", (PyCFunction) _wrap_PyShape_GetBranchNeckLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetBranchStemLength", (PyCFunction) _wrap_PyShape_SetBranchStemLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchStemLength", (PyCFunction) _wrap_PyShape_GetBranchStemLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetBranchSpacing", (PyCFunction) _wrap_PyShape_SetBranchSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchSpacing", (PyCFunction) _wrap_PyShape_GetBranchSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetBranchStyle", (PyCFunction) _wrap_PyShape_SetBranchStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBranchStyle", (PyCFunction) _wrap_PyShape_GetBranchStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_PhysicalToLogicalAttachment", (PyCFunction) _wrap_PyShape_PhysicalToLogicalAttachment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_LogicalToPhysicalAttachment", (PyCFunction) _wrap_PyShape_LogicalToPhysicalAttachment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Draggable", (PyCFunction) _wrap_PyShape_Draggable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_HasDescendant", (PyCFunction) _wrap_PyShape_HasDescendant, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_CreateNewCopy", (PyCFunction) _wrap_PyShape_CreateNewCopy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Copy", (PyCFunction) _wrap_PyShape_Copy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_CopyWithHandler", (PyCFunction) _wrap_PyShape_CopyWithHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Rotate", (PyCFunction) _wrap_PyShape_Rotate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetRotation", (PyCFunction) _wrap_PyShape_GetRotation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_SetRotation", (PyCFunction) _wrap_PyShape_SetRotation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ClearAttachments", (PyCFunction) _wrap_PyShape_ClearAttachments, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_Recentre", (PyCFunction) _wrap_PyShape_Recentre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_ClearPointList", (PyCFunction) _wrap_PyShape_ClearPointList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBackgroundPen", (PyCFunction) _wrap_PyShape_GetBackgroundPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_GetBackgroundBrush", (PyCFunction) _wrap_PyShape_GetBackgroundBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDelete", (PyCFunction) _wrap_PyShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDraw", (PyCFunction) _wrap_PyShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDrawContents", (PyCFunction) _wrap_PyShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDrawBranches", (PyCFunction) _wrap_PyShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnMoveLinks", (PyCFunction) _wrap_PyShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnErase", (PyCFunction) _wrap_PyShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnEraseContents", (PyCFunction) _wrap_PyShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnHighlight", (PyCFunction) _wrap_PyShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnLeftClick", (PyCFunction) _wrap_PyShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnRightClick", (PyCFunction) _wrap_PyShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnSize", (PyCFunction) _wrap_PyShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnMovePre", (PyCFunction) _wrap_PyShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnMovePost", (PyCFunction) _wrap_PyShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDragLeft", (PyCFunction) _wrap_PyShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDragRight", (PyCFunction) _wrap_PyShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnEndDragRight", (PyCFunction) _wrap_PyShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDrawOutline", (PyCFunction) _wrap_PyShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnMoveLink", (PyCFunction) _wrap_PyShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnBeginSize", (PyCFunction) _wrap_PyShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_base_OnEndSize", (PyCFunction) _wrap_PyShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShape_swigregister", PyShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PseudoMetaFile", (PyCFunction) _wrap_new_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_PseudoMetaFile", (PyCFunction) _wrap_delete_PseudoMetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_Draw", (PyCFunction) _wrap_PseudoMetaFile_Draw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_Clear", (PyCFunction) _wrap_PseudoMetaFile_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_Copy", (PyCFunction) _wrap_PseudoMetaFile_Copy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_Scale", (PyCFunction) _wrap_PseudoMetaFile_Scale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_ScaleTo", (PyCFunction) _wrap_PseudoMetaFile_ScaleTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_Translate", (PyCFunction) _wrap_PseudoMetaFile_Translate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_Rotate", (PyCFunction) _wrap_PseudoMetaFile_Rotate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_LoadFromMetaFile", (PyCFunction) _wrap_PseudoMetaFile_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_GetBounds", (PyCFunction) _wrap_PseudoMetaFile_GetBounds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_CalculateSize", (PyCFunction) _wrap_PseudoMetaFile_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetRotateable", (PyCFunction) _wrap_PseudoMetaFile_SetRotateable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_GetRotateable", (PyCFunction) _wrap_PseudoMetaFile_GetRotateable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetSize", (PyCFunction) _wrap_PseudoMetaFile_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_SetFillBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_GetFillBrush", (PyCFunction) _wrap_PseudoMetaFile_GetFillBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_SetOutlinePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_GetOutlinePen", (PyCFunction) _wrap_PseudoMetaFile_GetOutlinePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_SetOutlineOp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_GetOutlineOp", (PyCFunction) _wrap_PseudoMetaFile_GetOutlineOp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_IsValid", (PyCFunction) _wrap_PseudoMetaFile_IsValid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawLine", (PyCFunction) _wrap_PseudoMetaFile_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawRoundedRectangle", (PyCFunction) _wrap_PseudoMetaFile_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawArc", (PyCFunction) _wrap_PseudoMetaFile_DrawArc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawEllipticArc", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawEllipse", (PyCFunction) _wrap_PseudoMetaFile_DrawEllipse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawPoint", (PyCFunction) _wrap_PseudoMetaFile_DrawPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawText", (PyCFunction) _wrap_PseudoMetaFile_DrawText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawLines", (PyCFunction) _wrap_PseudoMetaFile_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawPolygon", (PyCFunction) _wrap_PseudoMetaFile_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DrawSpline", (PyCFunction) _wrap_PseudoMetaFile_DrawSpline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetClippingRect", (PyCFunction) _wrap_PseudoMetaFile_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_DestroyClippingRect", (PyCFunction) _wrap_PseudoMetaFile_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetPen", (PyCFunction) _wrap_PseudoMetaFile_SetPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetBrush", (PyCFunction) _wrap_PseudoMetaFile_SetBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetFont", (PyCFunction) _wrap_PseudoMetaFile_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetTextColour", (PyCFunction) _wrap_PseudoMetaFile_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetBackgroundColour", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_SetBackgroundMode", (PyCFunction) _wrap_PseudoMetaFile_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PseudoMetaFile_swigregister", PseudoMetaFile_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyRectangleShape", (PyCFunction) _wrap_new_PyRectangleShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape__setCallbackInfo", (PyCFunction) _wrap_PyRectangleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_SetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_SetCornerRadius, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_GetCornerRadius", (PyCFunction) _wrap_PyRectangleShape_GetCornerRadius, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDelete", (PyCFunction) _wrap_PyRectangleShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDraw", (PyCFunction) _wrap_PyRectangleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDrawContents", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnErase", (PyCFunction) _wrap_PyRectangleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnEraseContents", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnHighlight", (PyCFunction) _wrap_PyRectangleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnLeftClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyRectangleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnRightClick", (PyCFunction) _wrap_PyRectangleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnSize", (PyCFunction) _wrap_PyRectangleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnMovePre", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnMovePost", (PyCFunction) _wrap_PyRectangleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyRectangleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyRectangleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnMoveLink", (PyCFunction) _wrap_PyRectangleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyRectangleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnBeginSize", (PyCFunction) _wrap_PyRectangleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_base_OnEndSize", (PyCFunction) _wrap_PyRectangleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyRectangleShape_swigregister", PyRectangleShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyControlPoint", (PyCFunction) _wrap_new_PyControlPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint__setCallbackInfo", (PyCFunction) _wrap_PyControlPoint__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_SetCornerRadius", (PyCFunction) _wrap_PyControlPoint_SetCornerRadius, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDelete", (PyCFunction) _wrap_PyControlPoint_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDraw", (PyCFunction) _wrap_PyControlPoint_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDrawContents", (PyCFunction) _wrap_PyControlPoint_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDrawBranches", (PyCFunction) _wrap_PyControlPoint_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnMoveLinks", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnErase", (PyCFunction) _wrap_PyControlPoint_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnEraseContents", (PyCFunction) _wrap_PyControlPoint_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnHighlight", (PyCFunction) _wrap_PyControlPoint_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnLeftClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyControlPoint_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnRightClick", (PyCFunction) _wrap_PyControlPoint_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnSize", (PyCFunction) _wrap_PyControlPoint_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnMovePre", (PyCFunction) _wrap_PyControlPoint_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnMovePost", (PyCFunction) _wrap_PyControlPoint_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnBeginDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnEndDragRight", (PyCFunction) _wrap_PyControlPoint_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDrawOutline", (PyCFunction) _wrap_PyControlPoint_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnDrawControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnEraseControlPoints", (PyCFunction) _wrap_PyControlPoint_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnMoveLink", (PyCFunction) _wrap_PyControlPoint_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnSizingDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyControlPoint_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnBeginSize", (PyCFunction) _wrap_PyControlPoint_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_base_OnEndSize", (PyCFunction) _wrap_PyControlPoint_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControlPoint_swigregister", PyControlPoint_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyBitmapShape", (PyCFunction) _wrap_new_PyBitmapShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape__setCallbackInfo", (PyCFunction) _wrap_PyBitmapShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_GetBitmap", (PyCFunction) _wrap_PyBitmapShape_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_GetFilename", (PyCFunction) _wrap_PyBitmapShape_GetFilename, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_SetBitmap", (PyCFunction) _wrap_PyBitmapShape_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_SetFilename", (PyCFunction) _wrap_PyBitmapShape_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDelete", (PyCFunction) _wrap_PyBitmapShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDraw", (PyCFunction) _wrap_PyBitmapShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDrawContents", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDrawBranches", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnMoveLinks", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnErase", (PyCFunction) _wrap_PyBitmapShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnEraseContents", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnHighlight", (PyCFunction) _wrap_PyBitmapShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnLeftClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyBitmapShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnRightClick", (PyCFunction) _wrap_PyBitmapShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnSize", (PyCFunction) _wrap_PyBitmapShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnMovePre", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnMovePost", (PyCFunction) _wrap_PyBitmapShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnEndDragRight", (PyCFunction) _wrap_PyBitmapShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDrawOutline", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyBitmapShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnMoveLink", (PyCFunction) _wrap_PyBitmapShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyBitmapShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnBeginSize", (PyCFunction) _wrap_PyBitmapShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_base_OnEndSize", (PyCFunction) _wrap_PyBitmapShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapShape_swigregister", PyBitmapShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyDrawnShape", (PyCFunction) _wrap_new_PyDrawnShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape__setCallbackInfo", (PyCFunction) _wrap_PyDrawnShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_CalculateSize", (PyCFunction) _wrap_PyDrawnShape_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DestroyClippingRect", (PyCFunction) _wrap_PyDrawnShape_DestroyClippingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawArc", (PyCFunction) _wrap_PyDrawnShape_DrawArc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawAtAngle", (PyCFunction) _wrap_PyDrawnShape_DrawAtAngle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawEllipticArc", (PyCFunction) _wrap_PyDrawnShape_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawLine", (PyCFunction) _wrap_PyDrawnShape_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawLines", (PyCFunction) _wrap_PyDrawnShape_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawPoint", (PyCFunction) _wrap_PyDrawnShape_DrawPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawPolygon", (PyCFunction) _wrap_PyDrawnShape_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawRoundedRectangle", (PyCFunction) _wrap_PyDrawnShape_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawSpline", (PyCFunction) _wrap_PyDrawnShape_DrawSpline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_DrawText", (PyCFunction) _wrap_PyDrawnShape_DrawText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_GetAngle", (PyCFunction) _wrap_PyDrawnShape_GetAngle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_GetMetaFile", (PyCFunction) _wrap_PyDrawnShape_GetMetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_GetRotation", (PyCFunction) _wrap_PyDrawnShape_GetRotation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_LoadFromMetaFile", (PyCFunction) _wrap_PyDrawnShape_LoadFromMetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_Rotate", (PyCFunction) _wrap_PyDrawnShape_Rotate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetClippingRect", (PyCFunction) _wrap_PyDrawnShape_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetDrawnBackgroundColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetDrawnBackgroundMode", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBackgroundMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetDrawnBrush", (PyCFunction) _wrap_PyDrawnShape_SetDrawnBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetDrawnFont", (PyCFunction) _wrap_PyDrawnShape_SetDrawnFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetDrawnPen", (PyCFunction) _wrap_PyDrawnShape_SetDrawnPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetDrawnTextColour", (PyCFunction) _wrap_PyDrawnShape_SetDrawnTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_Scale", (PyCFunction) _wrap_PyDrawnShape_Scale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_SetSaveToFile", (PyCFunction) _wrap_PyDrawnShape_SetSaveToFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_Translate", (PyCFunction) _wrap_PyDrawnShape_Translate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDelete", (PyCFunction) _wrap_PyDrawnShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDraw", (PyCFunction) _wrap_PyDrawnShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDrawContents", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnErase", (PyCFunction) _wrap_PyDrawnShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnEraseContents", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnHighlight", (PyCFunction) _wrap_PyDrawnShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnLeftClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDrawnShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnRightClick", (PyCFunction) _wrap_PyDrawnShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnSize", (PyCFunction) _wrap_PyDrawnShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnMovePre", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnMovePost", (PyCFunction) _wrap_PyDrawnShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDrawnShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDrawnShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnMoveLink", (PyCFunction) _wrap_PyDrawnShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDrawnShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnBeginSize", (PyCFunction) _wrap_PyDrawnShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_base_OnEndSize", (PyCFunction) _wrap_PyDrawnShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDrawnShape_swigregister", PyDrawnShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_OGLConstraint", (PyCFunction) _wrap_new_OGLConstraint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"OGLConstraint_Evaluate", (PyCFunction) _wrap_OGLConstraint_Evaluate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"OGLConstraint_SetSpacing", (PyCFunction) _wrap_OGLConstraint_SetSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"OGLConstraint_Equals", (PyCFunction) _wrap_OGLConstraint_Equals, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"OGLConstraint_swigregister", OGLConstraint_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyCompositeShape", (PyCFunction) _wrap_new_PyCompositeShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape__setCallbackInfo", (PyCFunction) _wrap_PyCompositeShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_AddChild", (PyCFunction) _wrap_PyCompositeShape_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_AddConstraint", (PyCFunction) _wrap_PyCompositeShape_AddConstraint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_AddConstrainedShapes", (PyCFunction) _wrap_PyCompositeShape_AddConstrainedShapes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_AddSimpleConstraint", (PyCFunction) _wrap_PyCompositeShape_AddSimpleConstraint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_CalculateSize", (PyCFunction) _wrap_PyCompositeShape_CalculateSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_ContainsDivision", (PyCFunction) _wrap_PyCompositeShape_ContainsDivision, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_DeleteConstraint", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_DeleteConstraintsInvolvingChild", (PyCFunction) _wrap_PyCompositeShape_DeleteConstraintsInvolvingChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_FindContainerImage", (PyCFunction) _wrap_PyCompositeShape_FindContainerImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_GetConstraints", (PyCFunction) _wrap_PyCompositeShape_GetConstraints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_GetDivisions", (PyCFunction) _wrap_PyCompositeShape_GetDivisions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_MakeContainer", (PyCFunction) _wrap_PyCompositeShape_MakeContainer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_Recompute", (PyCFunction) _wrap_PyCompositeShape_Recompute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_RemoveChild", (PyCFunction) _wrap_PyCompositeShape_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDelete", (PyCFunction) _wrap_PyCompositeShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDraw", (PyCFunction) _wrap_PyCompositeShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDrawContents", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnErase", (PyCFunction) _wrap_PyCompositeShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnEraseContents", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnHighlight", (PyCFunction) _wrap_PyCompositeShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnLeftClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCompositeShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnRightClick", (PyCFunction) _wrap_PyCompositeShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnSize", (PyCFunction) _wrap_PyCompositeShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnMovePre", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnMovePost", (PyCFunction) _wrap_PyCompositeShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCompositeShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCompositeShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnMoveLink", (PyCFunction) _wrap_PyCompositeShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCompositeShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnBeginSize", (PyCFunction) _wrap_PyCompositeShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_base_OnEndSize", (PyCFunction) _wrap_PyCompositeShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCompositeShape_swigregister", PyCompositeShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyDividedShape", (PyCFunction) _wrap_new_PyDividedShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape__setCallbackInfo", (PyCFunction) _wrap_PyDividedShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_EditRegions", (PyCFunction) _wrap_PyDividedShape_EditRegions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_SetRegionSizes", (PyCFunction) _wrap_PyDividedShape_SetRegionSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDelete", (PyCFunction) _wrap_PyDividedShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDraw", (PyCFunction) _wrap_PyDividedShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDrawContents", (PyCFunction) _wrap_PyDividedShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDividedShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnErase", (PyCFunction) _wrap_PyDividedShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnEraseContents", (PyCFunction) _wrap_PyDividedShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnHighlight", (PyCFunction) _wrap_PyDividedShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnLeftClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDividedShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnRightClick", (PyCFunction) _wrap_PyDividedShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnSize", (PyCFunction) _wrap_PyDividedShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnMovePre", (PyCFunction) _wrap_PyDividedShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnMovePost", (PyCFunction) _wrap_PyDividedShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDividedShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDividedShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDividedShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnMoveLink", (PyCFunction) _wrap_PyDividedShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDividedShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnBeginSize", (PyCFunction) _wrap_PyDividedShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_base_OnEndSize", (PyCFunction) _wrap_PyDividedShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDividedShape_swigregister", PyDividedShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyDivisionShape", (PyCFunction) _wrap_new_PyDivisionShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape__setCallbackInfo", (PyCFunction) _wrap_PyDivisionShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_AdjustBottom", (PyCFunction) _wrap_PyDivisionShape_AdjustBottom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_AdjustLeft", (PyCFunction) _wrap_PyDivisionShape_AdjustLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_AdjustRight", (PyCFunction) _wrap_PyDivisionShape_AdjustRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_AdjustTop", (PyCFunction) _wrap_PyDivisionShape_AdjustTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_Divide", (PyCFunction) _wrap_PyDivisionShape_Divide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_EditEdge", (PyCFunction) _wrap_PyDivisionShape_EditEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetBottomSide", (PyCFunction) _wrap_PyDivisionShape_GetBottomSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetHandleSide", (PyCFunction) _wrap_PyDivisionShape_GetHandleSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetLeftSide", (PyCFunction) _wrap_PyDivisionShape_GetLeftSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_GetLeftSideColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_GetLeftSidePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetRightSide", (PyCFunction) _wrap_PyDivisionShape_GetRightSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetTopSide", (PyCFunction) _wrap_PyDivisionShape_GetTopSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_GetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_GetTopSidePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_ResizeAdjoining", (PyCFunction) _wrap_PyDivisionShape_ResizeAdjoining, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_PopupMenu", (PyCFunction) _wrap_PyDivisionShape_PopupMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetBottomSide", (PyCFunction) _wrap_PyDivisionShape_SetBottomSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetHandleSide", (PyCFunction) _wrap_PyDivisionShape_SetHandleSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetLeftSide", (PyCFunction) _wrap_PyDivisionShape_SetLeftSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetLeftSideColour", (PyCFunction) _wrap_PyDivisionShape_SetLeftSideColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetLeftSidePen", (PyCFunction) _wrap_PyDivisionShape_SetLeftSidePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetRightSide", (PyCFunction) _wrap_PyDivisionShape_SetRightSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetTopSide", (PyCFunction) _wrap_PyDivisionShape_SetTopSide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetTopSideColour", (PyCFunction) _wrap_PyDivisionShape_SetTopSideColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_SetTopSidePen", (PyCFunction) _wrap_PyDivisionShape_SetTopSidePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDelete", (PyCFunction) _wrap_PyDivisionShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDraw", (PyCFunction) _wrap_PyDivisionShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDrawContents", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDrawBranches", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnMoveLinks", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnErase", (PyCFunction) _wrap_PyDivisionShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnEraseContents", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnHighlight", (PyCFunction) _wrap_PyDivisionShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnLeftClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyDivisionShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnRightClick", (PyCFunction) _wrap_PyDivisionShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnSize", (PyCFunction) _wrap_PyDivisionShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnMovePre", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnMovePost", (PyCFunction) _wrap_PyDivisionShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnEndDragRight", (PyCFunction) _wrap_PyDivisionShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDrawOutline", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyDivisionShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnMoveLink", (PyCFunction) _wrap_PyDivisionShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyDivisionShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnBeginSize", (PyCFunction) _wrap_PyDivisionShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_base_OnEndSize", (PyCFunction) _wrap_PyDivisionShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDivisionShape_swigregister", PyDivisionShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyEllipseShape", (PyCFunction) _wrap_new_PyEllipseShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape__setCallbackInfo", (PyCFunction) _wrap_PyEllipseShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDraw", (PyCFunction) _wrap_PyEllipseShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDrawContents", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDrawBranches", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnMoveLinks", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnErase", (PyCFunction) _wrap_PyEllipseShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnEraseContents", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnHighlight", (PyCFunction) _wrap_PyEllipseShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnLeftClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyEllipseShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnRightClick", (PyCFunction) _wrap_PyEllipseShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnSize", (PyCFunction) _wrap_PyEllipseShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnMovePre", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnMovePost", (PyCFunction) _wrap_PyEllipseShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnEndDragRight", (PyCFunction) _wrap_PyEllipseShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDrawOutline", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyEllipseShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnMoveLink", (PyCFunction) _wrap_PyEllipseShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyEllipseShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnBeginSize", (PyCFunction) _wrap_PyEllipseShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_base_OnEndSize", (PyCFunction) _wrap_PyEllipseShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEllipseShape_swigregister", PyEllipseShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyCircleShape", (PyCFunction) _wrap_new_PyCircleShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape__setCallbackInfo", (PyCFunction) _wrap_PyCircleShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDraw", (PyCFunction) _wrap_PyCircleShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDrawContents", (PyCFunction) _wrap_PyCircleShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDrawBranches", (PyCFunction) _wrap_PyCircleShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnMoveLinks", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnErase", (PyCFunction) _wrap_PyCircleShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnEraseContents", (PyCFunction) _wrap_PyCircleShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnHighlight", (PyCFunction) _wrap_PyCircleShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnLeftClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyCircleShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnRightClick", (PyCFunction) _wrap_PyCircleShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnSize", (PyCFunction) _wrap_PyCircleShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnMovePre", (PyCFunction) _wrap_PyCircleShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnMovePost", (PyCFunction) _wrap_PyCircleShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnEndDragRight", (PyCFunction) _wrap_PyCircleShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDrawOutline", (PyCFunction) _wrap_PyCircleShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyCircleShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnMoveLink", (PyCFunction) _wrap_PyCircleShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyCircleShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnBeginSize", (PyCFunction) _wrap_PyCircleShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_base_OnEndSize", (PyCFunction) _wrap_PyCircleShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCircleShape_swigregister", PyCircleShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ArrowHead", (PyCFunction) _wrap_new_ArrowHead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ArrowHead", (PyCFunction) _wrap_delete_ArrowHead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead__GetType", (PyCFunction) _wrap_ArrowHead__GetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetPosition", (PyCFunction) _wrap_ArrowHead_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_SetPosition", (PyCFunction) _wrap_ArrowHead_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetXOffset", (PyCFunction) _wrap_ArrowHead_GetXOffset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetYOffset", (PyCFunction) _wrap_ArrowHead_GetYOffset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetSpacing", (PyCFunction) _wrap_ArrowHead_GetSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetSize", (PyCFunction) _wrap_ArrowHead_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetName", (PyCFunction) _wrap_ArrowHead_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_SetXOffset", (PyCFunction) _wrap_ArrowHead_SetXOffset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_SetYOffset", (PyCFunction) _wrap_ArrowHead_SetYOffset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetMetaFile", (PyCFunction) _wrap_ArrowHead_GetMetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetId", (PyCFunction) _wrap_ArrowHead_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetArrowEnd", (PyCFunction) _wrap_ArrowHead_GetArrowEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_GetArrowSize", (PyCFunction) _wrap_ArrowHead_GetArrowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_SetSize", (PyCFunction) _wrap_ArrowHead_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_SetSpacing", (PyCFunction) _wrap_ArrowHead_SetSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArrowHead_swigregister", ArrowHead_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyLineShape", (PyCFunction) _wrap_new_PyLineShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape__setCallbackInfo", (PyCFunction) _wrap_PyLineShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_AddArrow", (PyCFunction) _wrap_PyLineShape_AddArrow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_AddArrowOrdered", (PyCFunction) _wrap_PyLineShape_AddArrowOrdered, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_ClearArrow", (PyCFunction) _wrap_PyLineShape_ClearArrow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_ClearArrowsAtPosition", (PyCFunction) _wrap_PyLineShape_ClearArrowsAtPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_DrawArrow", (PyCFunction) _wrap_PyLineShape_DrawArrow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_DeleteArrowHeadId", (PyCFunction) _wrap_PyLineShape_DeleteArrowHeadId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_DeleteArrowHead", (PyCFunction) _wrap_PyLineShape_DeleteArrowHead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_DeleteLineControlPoint", (PyCFunction) _wrap_PyLineShape_DeleteLineControlPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_DrawArrows", (PyCFunction) _wrap_PyLineShape_DrawArrows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_DrawRegion", (PyCFunction) _wrap_PyLineShape_DrawRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_EraseRegion", (PyCFunction) _wrap_PyLineShape_EraseRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_FindArrowHeadId", (PyCFunction) _wrap_PyLineShape_FindArrowHeadId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_FindArrowHead", (PyCFunction) _wrap_PyLineShape_FindArrowHead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_FindLineEndPoints", (PyCFunction) _wrap_PyLineShape_FindLineEndPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_FindLinePosition", (PyCFunction) _wrap_PyLineShape_FindLinePosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_FindMinimumWidth", (PyCFunction) _wrap_PyLineShape_FindMinimumWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_FindNth", (PyCFunction) _wrap_PyLineShape_FindNth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_GetAttachmentFrom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetAttachmentTo", (PyCFunction) _wrap_PyLineShape_GetAttachmentTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetEnds", (PyCFunction) _wrap_PyLineShape_GetEnds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetFrom", (PyCFunction) _wrap_PyLineShape_GetFrom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetLabelPosition", (PyCFunction) _wrap_PyLineShape_GetLabelPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetNextControlPoint", (PyCFunction) _wrap_PyLineShape_GetNextControlPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetTo", (PyCFunction) _wrap_PyLineShape_GetTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_Initialise", (PyCFunction) _wrap_PyLineShape_Initialise, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_InsertLineControlPoint", (PyCFunction) _wrap_PyLineShape_InsertLineControlPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_IsEnd", (PyCFunction) _wrap_PyLineShape_IsEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_IsSpline", (PyCFunction) _wrap_PyLineShape_IsSpline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_MakeLineControlPoints", (PyCFunction) _wrap_PyLineShape_MakeLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetLineControlPoints", (PyCFunction) _wrap_PyLineShape_GetLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetLineControlPoints", (PyCFunction) _wrap_PyLineShape_SetLineControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetAttachmentFrom", (PyCFunction) _wrap_PyLineShape_SetAttachmentFrom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetAttachments", (PyCFunction) _wrap_PyLineShape_SetAttachments, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetAttachmentTo", (PyCFunction) _wrap_PyLineShape_SetAttachmentTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetEnds", (PyCFunction) _wrap_PyLineShape_SetEnds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetFrom", (PyCFunction) _wrap_PyLineShape_SetFrom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetIgnoreOffsets", (PyCFunction) _wrap_PyLineShape_SetIgnoreOffsets, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetSpline", (PyCFunction) _wrap_PyLineShape_SetSpline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetTo", (PyCFunction) _wrap_PyLineShape_SetTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_Straighten", (PyCFunction) _wrap_PyLineShape_Straighten, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_Unlink", (PyCFunction) _wrap_PyLineShape_Unlink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_SetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_SetAlignmentType", (PyCFunction) _wrap_PyLineShape_SetAlignmentType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetAlignmentOrientation", (PyCFunction) _wrap_PyLineShape_GetAlignmentOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetAlignmentType", (PyCFunction) _wrap_PyLineShape_GetAlignmentType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetAlignmentStart", (PyCFunction) _wrap_PyLineShape_GetAlignmentStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_GetAlignmentEnd", (PyCFunction) _wrap_PyLineShape_GetAlignmentEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDraw", (PyCFunction) _wrap_PyLineShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDrawContents", (PyCFunction) _wrap_PyLineShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDrawBranches", (PyCFunction) _wrap_PyLineShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnMoveLinks", (PyCFunction) _wrap_PyLineShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnErase", (PyCFunction) _wrap_PyLineShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnEraseContents", (PyCFunction) _wrap_PyLineShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnHighlight", (PyCFunction) _wrap_PyLineShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnLeftClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyLineShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnRightClick", (PyCFunction) _wrap_PyLineShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnSize", (PyCFunction) _wrap_PyLineShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnMovePre", (PyCFunction) _wrap_PyLineShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnMovePost", (PyCFunction) _wrap_PyLineShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDragRight", (PyCFunction) _wrap_PyLineShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyLineShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnEndDragRight", (PyCFunction) _wrap_PyLineShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDrawOutline", (PyCFunction) _wrap_PyLineShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyLineShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnMoveLink", (PyCFunction) _wrap_PyLineShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyLineShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnBeginSize", (PyCFunction) _wrap_PyLineShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_base_OnEndSize", (PyCFunction) _wrap_PyLineShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLineShape_swigregister", PyLineShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyPolygonShape", (PyCFunction) _wrap_new_PyPolygonShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape__setCallbackInfo", (PyCFunction) _wrap_PyPolygonShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_Create", (PyCFunction) _wrap_PyPolygonShape_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_AddPolygonPoint", (PyCFunction) _wrap_PyPolygonShape_AddPolygonPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_CalculatePolygonCentre", (PyCFunction) _wrap_PyPolygonShape_CalculatePolygonCentre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_DeletePolygonPoint", (PyCFunction) _wrap_PyPolygonShape_DeletePolygonPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_GetPoints", (PyCFunction) _wrap_PyPolygonShape_GetPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_GetOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_GetOriginalPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_GetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_GetOriginalWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_GetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_GetOriginalHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_SetOriginalWidth", (PyCFunction) _wrap_PyPolygonShape_SetOriginalWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_SetOriginalHeight", (PyCFunction) _wrap_PyPolygonShape_SetOriginalHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_UpdateOriginalPoints", (PyCFunction) _wrap_PyPolygonShape_UpdateOriginalPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDraw", (PyCFunction) _wrap_PyPolygonShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDrawContents", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDrawBranches", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnMoveLinks", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnErase", (PyCFunction) _wrap_PyPolygonShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnEraseContents", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnHighlight", (PyCFunction) _wrap_PyPolygonShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnLeftClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyPolygonShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnRightClick", (PyCFunction) _wrap_PyPolygonShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnSize", (PyCFunction) _wrap_PyPolygonShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnMovePre", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnMovePost", (PyCFunction) _wrap_PyPolygonShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnEndDragRight", (PyCFunction) _wrap_PyPolygonShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDrawOutline", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyPolygonShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnMoveLink", (PyCFunction) _wrap_PyPolygonShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyPolygonShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnBeginSize", (PyCFunction) _wrap_PyPolygonShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_base_OnEndSize", (PyCFunction) _wrap_PyPolygonShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPolygonShape_swigregister", PyPolygonShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyTextShape", (PyCFunction) _wrap_new_PyTextShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape__setCallbackInfo", (PyCFunction) _wrap_PyTextShape__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDelete", (PyCFunction) _wrap_PyTextShape_base_OnDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDraw", (PyCFunction) _wrap_PyTextShape_base_OnDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDrawContents", (PyCFunction) _wrap_PyTextShape_base_OnDrawContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDrawBranches", (PyCFunction) _wrap_PyTextShape_base_OnDrawBranches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnMoveLinks", (PyCFunction) _wrap_PyTextShape_base_OnMoveLinks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnErase", (PyCFunction) _wrap_PyTextShape_base_OnErase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnEraseContents", (PyCFunction) _wrap_PyTextShape_base_OnEraseContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnHighlight", (PyCFunction) _wrap_PyTextShape_base_OnHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnLeftClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnLeftDoubleClick", (PyCFunction) _wrap_PyTextShape_base_OnLeftDoubleClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnRightClick", (PyCFunction) _wrap_PyTextShape_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnSize", (PyCFunction) _wrap_PyTextShape_base_OnSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnMovePre", (PyCFunction) _wrap_PyTextShape_base_OnMovePre, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnMovePost", (PyCFunction) _wrap_PyTextShape_base_OnMovePost, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDragRight", (PyCFunction) _wrap_PyTextShape_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnBeginDragRight", (PyCFunction) _wrap_PyTextShape_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnEndDragRight", (PyCFunction) _wrap_PyTextShape_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDrawOutline", (PyCFunction) _wrap_PyTextShape_base_OnDrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnDrawControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnDrawControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnEraseControlPoints", (PyCFunction) _wrap_PyTextShape_base_OnEraseControlPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnMoveLink", (PyCFunction) _wrap_PyTextShape_base_OnMoveLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnSizingDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnSizingBeginDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnSizingEndDragLeft", (PyCFunction) _wrap_PyTextShape_base_OnSizingEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnBeginSize", (PyCFunction) _wrap_PyTextShape_base_OnBeginSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_base_OnEndSize", (PyCFunction) _wrap_PyTextShape_base_OnEndSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextShape_swigregister", PyTextShape_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Diagram", (PyCFunction) _wrap_new_Diagram, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_AddShape", (PyCFunction) _wrap_Diagram_AddShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_Clear", (PyCFunction) _wrap_Diagram_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_DeleteAllShapes", (PyCFunction) _wrap_Diagram_DeleteAllShapes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_DrawOutline", (PyCFunction) _wrap_Diagram_DrawOutline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_FindShape", (PyCFunction) _wrap_Diagram_FindShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetCanvas", (PyCFunction) _wrap_Diagram_GetCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetCount", (PyCFunction) _wrap_Diagram_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetGridSpacing", (PyCFunction) _wrap_Diagram_GetGridSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetMouseTolerance", (PyCFunction) _wrap_Diagram_GetMouseTolerance, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetShapeList", (PyCFunction) _wrap_Diagram_GetShapeList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetQuickEditMode", (PyCFunction) _wrap_Diagram_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_GetSnapToGrid", (PyCFunction) _wrap_Diagram_GetSnapToGrid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_InsertShape", (PyCFunction) _wrap_Diagram_InsertShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_RecentreAll", (PyCFunction) _wrap_Diagram_RecentreAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_Redraw", (PyCFunction) _wrap_Diagram_Redraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_RemoveAllShapes", (PyCFunction) _wrap_Diagram_RemoveAllShapes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_RemoveShape", (PyCFunction) _wrap_Diagram_RemoveShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_SetCanvas", (PyCFunction) _wrap_Diagram_SetCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_SetGridSpacing", (PyCFunction) _wrap_Diagram_SetGridSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_SetMouseTolerance", (PyCFunction) _wrap_Diagram_SetMouseTolerance, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_SetQuickEditMode", (PyCFunction) _wrap_Diagram_SetQuickEditMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_SetSnapToGrid", (PyCFunction) _wrap_Diagram_SetSnapToGrid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_ShowAll", (PyCFunction) _wrap_Diagram_ShowAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_Snap", (PyCFunction) _wrap_Diagram_Snap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Diagram_swigregister", Diagram_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyShapeCanvas", (PyCFunction) _wrap_new_PyShapeCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas__setCallbackInfo", (PyCFunction) _wrap_PyShapeCanvas__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_AddShape", (PyCFunction) _wrap_PyShapeCanvas_AddShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_FindShape", (PyCFunction) _wrap_PyShapeCanvas_FindShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_FindFirstSensitiveShape", (PyCFunction) _wrap_PyShapeCanvas_FindFirstSensitiveShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_GetDiagram", (PyCFunction) _wrap_PyShapeCanvas_GetDiagram, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_GetQuickEditMode", (PyCFunction) _wrap_PyShapeCanvas_GetQuickEditMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_InsertShape", (PyCFunction) _wrap_PyShapeCanvas_InsertShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnBeginDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnBeginDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnBeginDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnEndDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnEndDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnEndDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnDragLeft", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnDragRight", (PyCFunction) _wrap_PyShapeCanvas_base_OnDragRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnLeftClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnLeftClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_base_OnRightClick", (PyCFunction) _wrap_PyShapeCanvas_base_OnRightClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_Redraw", (PyCFunction) _wrap_PyShapeCanvas_Redraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_RemoveShape", (PyCFunction) _wrap_PyShapeCanvas_RemoveShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_SetDiagram", (PyCFunction) _wrap_PyShapeCanvas_SetDiagram, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_Snap", (PyCFunction) _wrap_PyShapeCanvas_Snap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyShapeCanvas_swigregister", PyShapeCanvas_swigregister, METH_VARARGS, NULL },
+        { (char *)"OGLInitialize", (PyCFunction) _wrap_OGLInitialize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"OGLCleanUp", (PyCFunction) _wrap_OGLCleanUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -34424,7 +34504,7 @@ _swigt__p_wxPyDividedShape,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -34450,70 +34530,70 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
-    PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_FromInt((int)oglMETAFLAGS_OUTLINE));
-    PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_FromInt((int)oglMETAFLAGS_ATTACHMENTS));
-    PyDict_SetItemString(d,"KEY_SHIFT", SWIG_FromInt((int)KEY_SHIFT));
-    PyDict_SetItemString(d,"KEY_CTRL", SWIG_FromInt((int)KEY_CTRL));
-    PyDict_SetItemString(d,"ARROW_NONE", SWIG_FromInt((int)ARROW_NONE));
-    PyDict_SetItemString(d,"ARROW_END", SWIG_FromInt((int)ARROW_END));
-    PyDict_SetItemString(d,"ARROW_BOTH", SWIG_FromInt((int)ARROW_BOTH));
-    PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_FromInt((int)ARROW_MIDDLE));
-    PyDict_SetItemString(d,"ARROW_START", SWIG_FromInt((int)ARROW_START));
-    PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_FromInt((int)ARROW_HOLLOW_CIRCLE));
-    PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_FromInt((int)ARROW_FILLED_CIRCLE));
-    PyDict_SetItemString(d,"ARROW_ARROW", SWIG_FromInt((int)ARROW_ARROW));
-    PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_FromInt((int)ARROW_SINGLE_OBLIQUE));
-    PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_FromInt((int)ARROW_DOUBLE_OBLIQUE));
-    PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_FromInt((int)ARROW_METAFILE));
-    PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_FromInt((int)ARROW_POSITION_END));
-    PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_FromInt((int)ARROW_POSITION_START));
-    PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_FromInt((int)CONTROL_POINT_VERTICAL));
-    PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_FromInt((int)CONTROL_POINT_HORIZONTAL));
-    PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_FromInt((int)CONTROL_POINT_DIAGONAL));
-    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_TO));
-    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_FromInt((int)CONTROL_POINT_ENDPOINT_FROM));
-    PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_FromInt((int)CONTROL_POINT_LINE));
-    PyDict_SetItemString(d,"FORMAT_NONE", SWIG_FromInt((int)FORMAT_NONE));
-    PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_FromInt((int)FORMAT_CENTRE_HORIZ));
-    PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_FromInt((int)FORMAT_CENTRE_VERT));
-    PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_FromInt((int)FORMAT_SIZE_TO_CONTENTS));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_FromInt((int)LINE_ALIGNMENT_HORIZ));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_FromInt((int)LINE_ALIGNMENT_VERT));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_FromInt((int)LINE_ALIGNMENT_TO_NEXT_HANDLE));
-    PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_FromInt((int)LINE_ALIGNMENT_NONE));
-    PyDict_SetItemString(d,"SHADOW_NONE", SWIG_FromInt((int)SHADOW_NONE));
-    PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_FromInt((int)SHADOW_LEFT));
-    PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_FromInt((int)SHADOW_RIGHT));
-    PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_FromInt((int)OP_CLICK_LEFT));
-    PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_FromInt((int)OP_CLICK_RIGHT));
-    PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_FromInt((int)OP_DRAG_LEFT));
-    PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_FromInt((int)OP_DRAG_RIGHT));
-    PyDict_SetItemString(d,"OP_ALL", SWIG_FromInt((int)OP_ALL));
-    PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_FromInt((int)ATTACHMENT_MODE_NONE));
-    PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_FromInt((int)ATTACHMENT_MODE_EDGE));
-    PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_FromInt((int)ATTACHMENT_MODE_BRANCHING));
-    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_FromInt((int)BRANCHING_ATTACHMENT_NORMAL));
-    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_FromInt((int)BRANCHING_ATTACHMENT_BLOB));
-    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_VERTICALLY));
-    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_HORIZONTALLY));
-    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_FromInt((int)gyCONSTRAINT_CENTRED_BOTH));
-    PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_FromInt((int)gyCONSTRAINT_LEFT_OF));
-    PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_FromInt((int)gyCONSTRAINT_RIGHT_OF));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_FromInt((int)gyCONSTRAINT_ABOVE));
-    PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_FromInt((int)gyCONSTRAINT_BELOW));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_TOP));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_BOTTOM));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_LEFT));
-    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_ALIGNED_RIGHT));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_TOP));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_BOTTOM));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_LEFT));
-    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_FromInt((int)gyCONSTRAINT_MIDALIGNED_RIGHT));
-    PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_FromInt((int)DIVISION_SIDE_NONE));
-    PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_FromInt((int)DIVISION_SIDE_LEFT));
-    PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_FromInt((int)DIVISION_SIDE_TOP));
-    PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_FromInt((int)DIVISION_SIDE_RIGHT));
-    PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_FromInt((int)DIVISION_SIDE_BOTTOM));
+    PyDict_SetItemString(d,"oglMETAFLAGS_OUTLINE", SWIG_From_int((int)oglMETAFLAGS_OUTLINE));
+    PyDict_SetItemString(d,"oglMETAFLAGS_ATTACHMENTS", SWIG_From_int((int)oglMETAFLAGS_ATTACHMENTS));
+    PyDict_SetItemString(d,"KEY_SHIFT", SWIG_From_int((int)KEY_SHIFT));
+    PyDict_SetItemString(d,"KEY_CTRL", SWIG_From_int((int)KEY_CTRL));
+    PyDict_SetItemString(d,"ARROW_NONE", SWIG_From_int((int)ARROW_NONE));
+    PyDict_SetItemString(d,"ARROW_END", SWIG_From_int((int)ARROW_END));
+    PyDict_SetItemString(d,"ARROW_BOTH", SWIG_From_int((int)ARROW_BOTH));
+    PyDict_SetItemString(d,"ARROW_MIDDLE", SWIG_From_int((int)ARROW_MIDDLE));
+    PyDict_SetItemString(d,"ARROW_START", SWIG_From_int((int)ARROW_START));
+    PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", SWIG_From_int((int)ARROW_HOLLOW_CIRCLE));
+    PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", SWIG_From_int((int)ARROW_FILLED_CIRCLE));
+    PyDict_SetItemString(d,"ARROW_ARROW", SWIG_From_int((int)ARROW_ARROW));
+    PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", SWIG_From_int((int)ARROW_SINGLE_OBLIQUE));
+    PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", SWIG_From_int((int)ARROW_DOUBLE_OBLIQUE));
+    PyDict_SetItemString(d,"ARROW_METAFILE", SWIG_From_int((int)ARROW_METAFILE));
+    PyDict_SetItemString(d,"ARROW_POSITION_END", SWIG_From_int((int)ARROW_POSITION_END));
+    PyDict_SetItemString(d,"ARROW_POSITION_START", SWIG_From_int((int)ARROW_POSITION_START));
+    PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", SWIG_From_int((int)CONTROL_POINT_VERTICAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", SWIG_From_int((int)CONTROL_POINT_HORIZONTAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", SWIG_From_int((int)CONTROL_POINT_DIAGONAL));
+    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", SWIG_From_int((int)CONTROL_POINT_ENDPOINT_TO));
+    PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", SWIG_From_int((int)CONTROL_POINT_ENDPOINT_FROM));
+    PyDict_SetItemString(d,"CONTROL_POINT_LINE", SWIG_From_int((int)CONTROL_POINT_LINE));
+    PyDict_SetItemString(d,"FORMAT_NONE", SWIG_From_int((int)FORMAT_NONE));
+    PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", SWIG_From_int((int)FORMAT_CENTRE_HORIZ));
+    PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", SWIG_From_int((int)FORMAT_CENTRE_VERT));
+    PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", SWIG_From_int((int)FORMAT_SIZE_TO_CONTENTS));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", SWIG_From_int((int)LINE_ALIGNMENT_HORIZ));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", SWIG_From_int((int)LINE_ALIGNMENT_VERT));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", SWIG_From_int((int)LINE_ALIGNMENT_TO_NEXT_HANDLE));
+    PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", SWIG_From_int((int)LINE_ALIGNMENT_NONE));
+    PyDict_SetItemString(d,"SHADOW_NONE", SWIG_From_int((int)SHADOW_NONE));
+    PyDict_SetItemString(d,"SHADOW_LEFT", SWIG_From_int((int)SHADOW_LEFT));
+    PyDict_SetItemString(d,"SHADOW_RIGHT", SWIG_From_int((int)SHADOW_RIGHT));
+    PyDict_SetItemString(d,"OP_CLICK_LEFT", SWIG_From_int((int)OP_CLICK_LEFT));
+    PyDict_SetItemString(d,"OP_CLICK_RIGHT", SWIG_From_int((int)OP_CLICK_RIGHT));
+    PyDict_SetItemString(d,"OP_DRAG_LEFT", SWIG_From_int((int)OP_DRAG_LEFT));
+    PyDict_SetItemString(d,"OP_DRAG_RIGHT", SWIG_From_int((int)OP_DRAG_RIGHT));
+    PyDict_SetItemString(d,"OP_ALL", SWIG_From_int((int)OP_ALL));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", SWIG_From_int((int)ATTACHMENT_MODE_NONE));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", SWIG_From_int((int)ATTACHMENT_MODE_EDGE));
+    PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", SWIG_From_int((int)ATTACHMENT_MODE_BRANCHING));
+    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", SWIG_From_int((int)BRANCHING_ATTACHMENT_NORMAL));
+    PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", SWIG_From_int((int)BRANCHING_ATTACHMENT_BLOB));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", SWIG_From_int((int)gyCONSTRAINT_CENTRED_VERTICALLY));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", SWIG_From_int((int)gyCONSTRAINT_CENTRED_HORIZONTALLY));
+    PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", SWIG_From_int((int)gyCONSTRAINT_CENTRED_BOTH));
+    PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", SWIG_From_int((int)gyCONSTRAINT_LEFT_OF));
+    PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", SWIG_From_int((int)gyCONSTRAINT_RIGHT_OF));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", SWIG_From_int((int)gyCONSTRAINT_ABOVE));
+    PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", SWIG_From_int((int)gyCONSTRAINT_BELOW));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_TOP));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_BOTTOM));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_LEFT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", SWIG_From_int((int)gyCONSTRAINT_ALIGNED_RIGHT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_TOP));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_BOTTOM));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_LEFT));
+    PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", SWIG_From_int((int)gyCONSTRAINT_MIDALIGNED_RIGHT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_NONE", SWIG_From_int((int)DIVISION_SIDE_NONE));
+    PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", SWIG_From_int((int)DIVISION_SIDE_LEFT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_TOP", SWIG_From_int((int)DIVISION_SIDE_TOP));
+    PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", SWIG_From_int((int)DIVISION_SIDE_RIGHT));
+    PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", SWIG_From_int((int)DIVISION_SIDE_BOTTOM));
     
     
     //     initoglbasicc();

diff --git a/wxPython/contrib/stc/mac/stc_wrap.cpp b/wxPython/contrib/stc/mac/stc_wrap.cpp
index 1693f590b39d1775d9e43b662e2a2624d38aa52e..7f829b3a8dda861eb09f82e8dd74f04be6936270 100644 (file)
--- a/wxPython/contrib/stc/mac/stc_wrap.cpp
+++ b/wxPython/contrib/stc/mac/stc_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxRect swig_types[0] 
@@ -237,47 +239,64 @@ static swig_type_info *swig_types[20];
 
 #define SWIG_name    "_stc"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -290,119 +309,184 @@ static swig_type_info *swig_types[20];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
     return 1;
   }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
+}
+
+
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
+{
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -415,46 +499,54 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
-/* returns '1' if the input is a raw char*, '0' if is a PyString */
+
+/* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */
 SWIGSTATIC(int)
-SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* size)
+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize)
 {
   static swig_type_info* pchar_info = 0;
-  int psize = 0;
+  char* vptr = 0;
   if (!pchar_info) pchar_info = SWIG_TypeQuery("char *");
-
-  if (SWIG_ConvertPtr(obj, swig_reinterpret_cast(void **,cptr), pchar_info, 0) == -1) {
-    PyErr_Clear();
-    PyString_AsStringAndSize(obj, cptr, &psize);
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      PyErr_SetString(PyExc_TypeError,"a string is expected");
-    }
-    if (size) *size = psize;
-    return 0;
+  if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_info, 0) != -1) {
+    if (cptr) *cptr = vptr;
+    if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0;
+    return SWIG_OLDOBJ;
   } else {
-    if (size) *size = (*cptr) ? (strlen(*cptr) + 1) : 0;
-    return 1;
+    if (PyString_Check(obj)) {
+      if (cptr) {
+       *cptr = PyString_AS_STRING(obj);
+       if (psize) {
+         *psize = PyString_GET_SIZE(obj) + 1;
+       }
+      }
+      return SWIG_PYSTR;
+    }
+  }
+  if (cptr) {
+    PyErr_SetString(PyExc_TypeError, "a string is expected");
   }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(char* )
-SWIG_AsCharPtr(PyObject *obj)
+SWIGSTATICINLINE(int)
+SWIG_AsCharPtr(PyObject *obj, char **val)
 {
-  char* cptr;
-  SWIG_AsCharPtrAndSize(obj, &cptr, 0);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
+  char* cptr = 0;
+  if (SWIG_AsCharPtrAndSize(obj, &cptr, (size_t*)(0))) {
+    if (val) *val = cptr;
+    return 1;
+  }
+  if (val) {
     PyErr_SetString(PyExc_TypeError, "a char* is expected");
-  }  
-  return cptr;
+  }
+  return 0;
 }
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_STCNameStr_set(PyObject *_val) {
+static int _wrap_STCNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable STCNameStr is read-only.");
     return 1;
 }
@@ -474,7 +566,7 @@ static PyObject *_wrap_STCNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StyledTextCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxID_ANY ;
@@ -503,7 +595,7 @@ static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -519,7 +611,7 @@ static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -552,7 +644,7 @@ static PyObject *_wrap_new_StyledTextCtrl(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_PreStyledTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreStyledTextCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *result;
     char *kwnames[] = {
@@ -575,7 +667,7 @@ static PyObject *_wrap_new_PreStyledTextCtrl(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -607,7 +699,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -623,7 +715,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -655,7 +747,7 @@ static PyObject *_wrap_StyledTextCtrl_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AddText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AddText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -696,7 +788,7 @@ static PyObject *_wrap_StyledTextCtrl_AddText(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AddStyledText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AddStyledText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxMemoryBuffer *arg2 = 0 ;
@@ -742,7 +834,7 @@ static PyObject *_wrap_StyledTextCtrl_AddStyledText(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_InsertText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_InsertText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -758,7 +850,7 @@ static PyObject *_wrap_StyledTextCtrl_InsertText(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_InsertText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -787,7 +879,7 @@ static PyObject *_wrap_StyledTextCtrl_InsertText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ClearAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ClearAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -812,7 +904,7 @@ static PyObject *_wrap_StyledTextCtrl_ClearAll(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ClearDocumentStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ClearDocumentStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -837,7 +929,7 @@ static PyObject *_wrap_StyledTextCtrl_ClearDocumentStyle(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -856,14 +948,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLength(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCharAt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCharAt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -877,7 +969,7 @@ static PyObject *_wrap_StyledTextCtrl_GetCharAt(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetCharAt",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -886,14 +978,14 @@ static PyObject *_wrap_StyledTextCtrl_GetCharAt(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCurrentPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCurrentPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -912,14 +1004,14 @@ static PyObject *_wrap_StyledTextCtrl_GetCurrentPos(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -938,14 +1030,14 @@ static PyObject *_wrap_StyledTextCtrl_GetAnchor(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetStyleAt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetStyleAt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -959,7 +1051,7 @@ static PyObject *_wrap_StyledTextCtrl_GetStyleAt(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetStyleAt",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -968,14 +1060,14 @@ static PyObject *_wrap_StyledTextCtrl_GetStyleAt(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Redo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Redo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1000,7 +1092,7 @@ static PyObject *_wrap_StyledTextCtrl_Redo(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetUndoCollection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetUndoCollection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -1013,7 +1105,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUndoCollection(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetUndoCollection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1029,7 +1121,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUndoCollection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1054,7 +1146,7 @@ static PyObject *_wrap_StyledTextCtrl_SelectAll(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSavePoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSavePoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1079,7 +1171,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSavePoint(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetStyledText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetStyledText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1095,9 +1187,9 @@ static PyObject *_wrap_StyledTextCtrl_GetStyledText(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_GetStyledText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1115,7 +1207,7 @@ static PyObject *_wrap_StyledTextCtrl_GetStyledText(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CanRedo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -1143,7 +1235,7 @@ static PyObject *_wrap_StyledTextCtrl_CanRedo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerLineFromHandle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerLineFromHandle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1157,7 +1249,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerLineFromHandle(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_MarkerLineFromHandle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1166,14 +1258,14 @@ static PyObject *_wrap_StyledTextCtrl_MarkerLineFromHandle(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerDeleteHandle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerDeleteHandle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1186,7 +1278,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDeleteHandle(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_MarkerDeleteHandle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1202,7 +1294,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDeleteHandle(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetUndoCollection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetUndoCollection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -1230,7 +1322,7 @@ static PyObject *_wrap_StyledTextCtrl_GetUndoCollection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetViewWhiteSpace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetViewWhiteSpace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -1249,14 +1341,14 @@ static PyObject *_wrap_StyledTextCtrl_GetViewWhiteSpace(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetViewWhiteSpace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetViewWhiteSpace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1269,7 +1361,7 @@ static PyObject *_wrap_StyledTextCtrl_SetViewWhiteSpace(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetViewWhiteSpace",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1285,7 +1377,7 @@ static PyObject *_wrap_StyledTextCtrl_SetViewWhiteSpace(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PositionFromPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PositionFromPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxPoint arg2 ;
@@ -1310,14 +1402,14 @@ static PyObject *_wrap_StyledTextCtrl_PositionFromPoint(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PositionFromPointClose(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PositionFromPointClose(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1333,9 +1425,9 @@ static PyObject *_wrap_StyledTextCtrl_PositionFromPointClose(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_PositionFromPointClose",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1344,14 +1436,14 @@ static PyObject *_wrap_StyledTextCtrl_PositionFromPointClose(PyObject *self, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GotoLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GotoLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1364,7 +1456,7 @@ static PyObject *_wrap_StyledTextCtrl_GotoLine(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GotoLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1380,7 +1472,7 @@ static PyObject *_wrap_StyledTextCtrl_GotoLine(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GotoPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GotoPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1393,7 +1485,7 @@ static PyObject *_wrap_StyledTextCtrl_GotoPos(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GotoPos",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1409,7 +1501,7 @@ static PyObject *_wrap_StyledTextCtrl_GotoPos(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1422,7 +1514,7 @@ static PyObject *_wrap_StyledTextCtrl_SetAnchor(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetAnchor",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1438,18 +1530,19 @@ static PyObject *_wrap_StyledTextCtrl_SetAnchor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCurLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCurLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int *arg2 = (int *) 0 ;
     wxString result;
     int temp2 ;
+    int res2 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetCurLine",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1467,17 +1560,15 @@ static PyObject *_wrap_StyledTextCtrl_GetCurLine(PyObject *self, PyObject *args,
         resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
 #endif
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetEndStyled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetEndStyled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -1496,14 +1587,14 @@ static PyObject *_wrap_StyledTextCtrl_GetEndStyled(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ConvertEOLs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ConvertEOLs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1516,7 +1607,7 @@ static PyObject *_wrap_StyledTextCtrl_ConvertEOLs(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_ConvertEOLs",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1532,7 +1623,7 @@ static PyObject *_wrap_StyledTextCtrl_ConvertEOLs(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetEOLMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetEOLMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -1551,14 +1642,14 @@ static PyObject *_wrap_StyledTextCtrl_GetEOLMode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetEOLMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetEOLMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1571,7 +1662,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEOLMode(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetEOLMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1587,7 +1678,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEOLMode(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StartStyling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StartStyling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1602,9 +1693,9 @@ static PyObject *_wrap_StyledTextCtrl_StartStyling(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StartStyling",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1620,7 +1711,7 @@ static PyObject *_wrap_StyledTextCtrl_StartStyling(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetStyling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetStyling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1635,9 +1726,9 @@ static PyObject *_wrap_StyledTextCtrl_SetStyling(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetStyling",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1653,7 +1744,7 @@ static PyObject *_wrap_StyledTextCtrl_SetStyling(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetBufferedDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetBufferedDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -1681,7 +1772,7 @@ static PyObject *_wrap_StyledTextCtrl_GetBufferedDraw(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetBufferedDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetBufferedDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -1694,7 +1785,7 @@ static PyObject *_wrap_StyledTextCtrl_SetBufferedDraw(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetBufferedDraw",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1710,7 +1801,7 @@ static PyObject *_wrap_StyledTextCtrl_SetBufferedDraw(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetTabWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetTabWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1723,7 +1814,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTabWidth(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTabWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1739,7 +1830,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTabWidth(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTabWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTabWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -1758,14 +1849,14 @@ static PyObject *_wrap_StyledTextCtrl_GetTabWidth(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCodePage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCodePage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1778,7 +1869,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCodePage(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCodePage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1794,7 +1885,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCodePage(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerDefine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerDefine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1817,9 +1908,9 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDefine(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:StyledTextCtrl_MarkerDefine",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         {
@@ -1847,7 +1938,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDefine(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerSetForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerSetForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1863,7 +1954,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerSetForeground(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerSetForeground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -1883,7 +1974,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerSetForeground(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerSetBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerSetBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1899,7 +1990,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerSetBackground(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerSetBackground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -1919,7 +2010,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerSetBackground(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerAdd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerAdd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1935,9 +2026,9 @@ static PyObject *_wrap_StyledTextCtrl_MarkerAdd(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerAdd",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1946,14 +2037,14 @@ static PyObject *_wrap_StyledTextCtrl_MarkerAdd(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1968,9 +2059,9 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDelete(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerDelete",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1986,7 +2077,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDelete(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerDeleteAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerDeleteAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -1999,7 +2090,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDeleteAll(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_MarkerDeleteAll",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2015,7 +2106,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDeleteAll(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerGet(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerGet(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2029,7 +2120,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerGet(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_MarkerGet",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2038,14 +2129,14 @@ static PyObject *_wrap_StyledTextCtrl_MarkerGet(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2061,9 +2152,9 @@ static PyObject *_wrap_StyledTextCtrl_MarkerNext(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerNext",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2072,14 +2163,14 @@ static PyObject *_wrap_StyledTextCtrl_MarkerNext(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerPrevious(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerPrevious(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2095,9 +2186,9 @@ static PyObject *_wrap_StyledTextCtrl_MarkerPrevious(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerPrevious",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2106,14 +2197,14 @@ static PyObject *_wrap_StyledTextCtrl_MarkerPrevious(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MarkerDefineBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MarkerDefineBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2128,7 +2219,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDefineBitmap(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_MarkerDefineBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -2151,7 +2242,7 @@ static PyObject *_wrap_StyledTextCtrl_MarkerDefineBitmap(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMarginType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMarginType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2166,9 +2257,9 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginType(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetMarginType",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2184,7 +2275,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginType(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMarginType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMarginType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2198,7 +2289,7 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginType(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetMarginType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2207,14 +2298,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginType(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2229,9 +2320,9 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginWidth(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetMarginWidth",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2247,7 +2338,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginWidth(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2261,7 +2352,7 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginWidth(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetMarginWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2270,14 +2361,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginWidth(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMarginMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMarginMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2292,9 +2383,9 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginMask(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetMarginMask",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2310,7 +2401,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginMask(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMarginMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMarginMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2324,7 +2415,7 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginMask(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetMarginMask",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2333,14 +2424,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginMask(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMarginSensitive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMarginSensitive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2355,9 +2446,9 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginSensitive(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetMarginSensitive",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2373,7 +2464,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginSensitive(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMarginSensitive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMarginSensitive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2387,7 +2478,7 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginSensitive(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetMarginSensitive",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2405,7 +2496,7 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginSensitive(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleClearAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleClearAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2430,7 +2521,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleClearAll(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2446,7 +2537,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetForeground(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetForeground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -2466,7 +2557,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetForeground(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2482,7 +2573,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetBackground(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetBackground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -2502,7 +2593,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetBackground(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2517,9 +2608,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetBold(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetBold",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2535,7 +2626,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetBold(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetItalic(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetItalic(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2550,9 +2641,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetItalic(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetItalic",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2568,7 +2659,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetItalic(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2583,9 +2674,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetSize(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2601,7 +2692,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetFaceName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2617,7 +2708,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFaceName(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetFaceName",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -2646,7 +2737,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFaceName(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetEOLFilled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetEOLFilled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2661,9 +2752,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetEOLFilled(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetEOLFilled",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2679,7 +2770,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetEOLFilled(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleResetDefault(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleResetDefault(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2704,7 +2795,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleResetDefault(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetUnderline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetUnderline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2719,9 +2810,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetUnderline(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetUnderline",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2737,7 +2828,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetUnderline(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetCase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetCase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2752,9 +2843,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetCase(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetCase",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2770,7 +2861,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetCase(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetCharacterSet(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetCharacterSet(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2785,9 +2876,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetCharacterSet(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetCharacterSet",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2803,7 +2894,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetCharacterSet(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetHotSpot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetHotSpot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2818,9 +2909,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetHotSpot(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetHotSpot",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2836,7 +2927,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetHotSpot(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSelForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSelForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -2852,7 +2943,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelForeground(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetSelForeground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -2872,7 +2963,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelForeground(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSelBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSelBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -2888,7 +2979,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelBackground(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetSelBackground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -2908,7 +2999,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelBackground(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCaretForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCaretForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2940,7 +3031,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretForeground(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CmdKeyAssign(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CmdKeyAssign(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2957,11 +3048,11 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyAssign(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:StyledTextCtrl_CmdKeyAssign",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2977,7 +3068,7 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyAssign(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CmdKeyClear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CmdKeyClear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -2992,9 +3083,9 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyClear(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_CmdKeyClear",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3010,7 +3101,7 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyClear(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CmdKeyClearAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CmdKeyClearAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3035,7 +3126,7 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyClearAll(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetStyleBytes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetStyleBytes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3050,10 +3141,9 @@ static PyObject *_wrap_StyledTextCtrl_SetStyleBytes(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetStyleBytes",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
-    if (PyErr_Occurred()) SWIG_fail;
-    arg3 = SWIG_AsCharPtr(obj2);
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
+    if (!SWIG_AsCharPtr(obj2, (char**)&arg3)) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         (arg1)->SetStyleBytes(arg2,arg3);
@@ -3068,7 +3158,7 @@ static PyObject *_wrap_StyledTextCtrl_SetStyleBytes(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3083,9 +3173,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetVisible(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetVisible",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3101,7 +3191,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetVisible(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCaretPeriod(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCaretPeriod(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -3120,14 +3210,14 @@ static PyObject *_wrap_StyledTextCtrl_GetCaretPeriod(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCaretPeriod(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCaretPeriod(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3140,7 +3230,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretPeriod(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCaretPeriod",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3156,7 +3246,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretPeriod(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetWordChars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetWordChars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -3197,7 +3287,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWordChars(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_BeginUndoAction(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_BeginUndoAction(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3222,7 +3312,7 @@ static PyObject *_wrap_StyledTextCtrl_BeginUndoAction(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_EndUndoAction(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_EndUndoAction(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3247,7 +3337,7 @@ static PyObject *_wrap_StyledTextCtrl_EndUndoAction(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_IndicatorSetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_IndicatorSetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3262,9 +3352,9 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorSetStyle(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_IndicatorSetStyle",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3280,7 +3370,7 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorSetStyle(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_IndicatorGetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_IndicatorGetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3294,7 +3384,7 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorGetStyle(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_IndicatorGetStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3303,14 +3393,14 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorGetStyle(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_IndicatorSetForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_IndicatorSetForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3326,7 +3416,7 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorSetForeground(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_IndicatorSetForeground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -3346,7 +3436,7 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorSetForeground(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_IndicatorGetForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_IndicatorGetForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3360,7 +3450,7 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorGetForeground(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_IndicatorGetForeground",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3380,7 +3470,7 @@ static PyObject *_wrap_StyledTextCtrl_IndicatorGetForeground(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetWhitespaceForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetWhitespaceForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -3396,7 +3486,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWhitespaceForeground(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetWhitespaceForeground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -3416,7 +3506,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWhitespaceForeground(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetWhitespaceBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetWhitespaceBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -3432,7 +3522,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWhitespaceBackground(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetWhitespaceBackground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -3452,7 +3542,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWhitespaceBackground(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetStyleBits(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetStyleBits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3465,7 +3555,7 @@ static PyObject *_wrap_StyledTextCtrl_SetStyleBits(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetStyleBits",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3481,7 +3571,7 @@ static PyObject *_wrap_StyledTextCtrl_SetStyleBits(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetStyleBits(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetStyleBits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -3500,14 +3590,14 @@ static PyObject *_wrap_StyledTextCtrl_GetStyleBits(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetLineState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetLineState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3522,9 +3612,9 @@ static PyObject *_wrap_StyledTextCtrl_SetLineState(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetLineState",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3540,7 +3630,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLineState(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3554,7 +3644,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineState(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineState",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3563,14 +3653,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineState(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMaxLineState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMaxLineState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -3589,14 +3679,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMaxLineState(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCaretLineVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCaretLineVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -3624,7 +3714,7 @@ static PyObject *_wrap_StyledTextCtrl_GetCaretLineVisible(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCaretLineVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCaretLineVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -3637,7 +3727,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretLineVisible(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCaretLineVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3653,7 +3743,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretLineVisible(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCaretLineBack(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCaretLineBack(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour result;
@@ -3683,7 +3773,7 @@ static PyObject *_wrap_StyledTextCtrl_GetCaretLineBack(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCaretLineBack(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCaretLineBack(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3715,7 +3805,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretLineBack(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetChangeable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetChangeable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3730,9 +3820,9 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetChangeable(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetChangeable",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3748,7 +3838,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetChangeable(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompShow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3764,7 +3854,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompShow(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_AutoCompShow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -3793,7 +3883,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompShow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompCancel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompCancel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3818,7 +3908,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompCancel(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompActive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -3846,7 +3936,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompActive(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompPosStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompPosStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -3865,14 +3955,14 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompPosStart(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompComplete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompComplete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3897,7 +3987,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompComplete(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompStops(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompStops(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -3938,7 +4028,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompStops(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -3951,7 +4041,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetSeparator(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetSeparator",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3967,7 +4057,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetSeparator(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -3986,14 +4076,14 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetSeparator(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSelect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSelect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -4034,7 +4124,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSelect(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetCancelAtStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetCancelAtStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4047,7 +4137,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetCancelAtStart(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetCancelAtStart",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4063,7 +4153,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetCancelAtStart(PyObject *self, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetCancelAtStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetCancelAtStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4091,7 +4181,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetCancelAtStart(PyObject *self, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetFillUps(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetFillUps(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -4132,7 +4222,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetFillUps(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetChooseSingle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetChooseSingle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4145,7 +4235,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetChooseSingle(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetChooseSingle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4161,7 +4251,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetChooseSingle(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetChooseSingle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetChooseSingle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4189,7 +4279,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetChooseSingle(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetIgnoreCase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetIgnoreCase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4202,7 +4292,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetIgnoreCase(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetIgnoreCase",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4218,7 +4308,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetIgnoreCase(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetIgnoreCase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetIgnoreCase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4246,7 +4336,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetIgnoreCase(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_UserListShow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_UserListShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4262,7 +4352,7 @@ static PyObject *_wrap_StyledTextCtrl_UserListShow(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_UserListShow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -4291,7 +4381,7 @@ static PyObject *_wrap_StyledTextCtrl_UserListShow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetAutoHide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetAutoHide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4304,7 +4394,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetAutoHide(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetAutoHide",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4320,7 +4410,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetAutoHide(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetAutoHide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetAutoHide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4348,7 +4438,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetAutoHide(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetDropRestOfWord(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetDropRestOfWord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4361,7 +4451,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetDropRestOfWord(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetDropRestOfWord",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4377,7 +4467,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetDropRestOfWord(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetDropRestOfWord(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetDropRestOfWord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4405,7 +4495,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetDropRestOfWord(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_RegisterImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_RegisterImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4420,7 +4510,7 @@ static PyObject *_wrap_StyledTextCtrl_RegisterImage(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_RegisterImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -4443,7 +4533,7 @@ static PyObject *_wrap_StyledTextCtrl_RegisterImage(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ClearRegisteredImages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ClearRegisteredImages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4468,7 +4558,7 @@ static PyObject *_wrap_StyledTextCtrl_ClearRegisteredImages(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetTypeSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetTypeSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -4487,14 +4577,14 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetTypeSeparator(PyObject *self, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompSetTypeSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompSetTypeSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4507,7 +4597,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetTypeSeparator(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_AutoCompSetTypeSeparator",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4523,7 +4613,7 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompSetTypeSeparator(PyObject *self, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4536,7 +4626,7 @@ static PyObject *_wrap_StyledTextCtrl_SetIndent(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4552,7 +4642,7 @@ static PyObject *_wrap_StyledTextCtrl_SetIndent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -4571,14 +4661,14 @@ static PyObject *_wrap_StyledTextCtrl_GetIndent(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetUseTabs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetUseTabs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4591,7 +4681,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseTabs(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetUseTabs",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4607,7 +4697,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseTabs(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetUseTabs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetUseTabs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4635,7 +4725,7 @@ static PyObject *_wrap_StyledTextCtrl_GetUseTabs(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetLineIndentation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetLineIndentation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4650,9 +4740,9 @@ static PyObject *_wrap_StyledTextCtrl_SetLineIndentation(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetLineIndentation",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4668,7 +4758,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLineIndentation(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineIndentation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineIndentation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4682,7 +4772,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineIndentation(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineIndentation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4691,14 +4781,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineIndentation(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineIndentPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineIndentPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4712,7 +4802,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineIndentPosition(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineIndentPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4721,14 +4811,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineIndentPosition(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4742,7 +4832,7 @@ static PyObject *_wrap_StyledTextCtrl_GetColumn(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4751,14 +4841,14 @@ static PyObject *_wrap_StyledTextCtrl_GetColumn(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetUseHorizontalScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetUseHorizontalScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4771,7 +4861,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseHorizontalScrollBar(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetUseHorizontalScrollBar",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4787,7 +4877,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseHorizontalScrollBar(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetUseHorizontalScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetUseHorizontalScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4815,7 +4905,7 @@ static PyObject *_wrap_StyledTextCtrl_GetUseHorizontalScrollBar(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetIndentationGuides(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetIndentationGuides(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -4828,7 +4918,7 @@ static PyObject *_wrap_StyledTextCtrl_SetIndentationGuides(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetIndentationGuides",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4844,7 +4934,7 @@ static PyObject *_wrap_StyledTextCtrl_SetIndentationGuides(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetIndentationGuides(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetIndentationGuides(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -4872,7 +4962,7 @@ static PyObject *_wrap_StyledTextCtrl_GetIndentationGuides(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetHighlightGuide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetHighlightGuide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4885,7 +4975,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHighlightGuide(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetHighlightGuide",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4901,7 +4991,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHighlightGuide(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetHighlightGuide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetHighlightGuide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -4920,14 +5010,14 @@ static PyObject *_wrap_StyledTextCtrl_GetHighlightGuide(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineEndPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineEndPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -4941,7 +5031,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineEndPosition(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineEndPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4950,14 +5040,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineEndPosition(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCodePage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCodePage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -4976,14 +5066,14 @@ static PyObject *_wrap_StyledTextCtrl_GetCodePage(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCaretForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCaretForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour result;
@@ -5013,7 +5103,7 @@ static PyObject *_wrap_StyledTextCtrl_GetCaretForeground(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -5041,7 +5131,7 @@ static PyObject *_wrap_StyledTextCtrl_GetReadOnly(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCurrentPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCurrentPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5054,7 +5144,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCurrentPos(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCurrentPos",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5070,7 +5160,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCurrentPos(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSelectionStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSelectionStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5083,7 +5173,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelectionStart(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetSelectionStart",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5099,7 +5189,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelectionStart(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSelectionStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSelectionStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5118,14 +5208,14 @@ static PyObject *_wrap_StyledTextCtrl_GetSelectionStart(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSelectionEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSelectionEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5138,7 +5228,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelectionEnd(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetSelectionEnd",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5154,7 +5244,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelectionEnd(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSelectionEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSelectionEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5173,14 +5263,14 @@ static PyObject *_wrap_StyledTextCtrl_GetSelectionEnd(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetPrintMagnification(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetPrintMagnification(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5193,7 +5283,7 @@ static PyObject *_wrap_StyledTextCtrl_SetPrintMagnification(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetPrintMagnification",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5209,7 +5299,7 @@ static PyObject *_wrap_StyledTextCtrl_SetPrintMagnification(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetPrintMagnification(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetPrintMagnification(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5228,14 +5318,14 @@ static PyObject *_wrap_StyledTextCtrl_GetPrintMagnification(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetPrintColourMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetPrintColourMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5248,7 +5338,7 @@ static PyObject *_wrap_StyledTextCtrl_SetPrintColourMode(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetPrintColourMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5264,7 +5354,7 @@ static PyObject *_wrap_StyledTextCtrl_SetPrintColourMode(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetPrintColourMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetPrintColourMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5283,14 +5373,14 @@ static PyObject *_wrap_StyledTextCtrl_GetPrintColourMode(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5311,9 +5401,9 @@ static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:StyledTextCtrl_FindText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -5321,7 +5411,7 @@ static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, P
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5331,7 +5421,7 @@ static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp4)
         delete arg4;
@@ -5346,7 +5436,7 @@ static PyObject *_wrap_StyledTextCtrl_FindText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_FormatRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_FormatRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -5374,11 +5464,11 @@ static PyObject *_wrap_StyledTextCtrl_FormatRange(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:StyledTextCtrl_FormatRange",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxDC,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -5397,14 +5487,14 @@ static PyObject *_wrap_StyledTextCtrl_FormatRange(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetFirstVisibleLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetFirstVisibleLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5423,14 +5513,14 @@ static PyObject *_wrap_StyledTextCtrl_GetFirstVisibleLine(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5444,7 +5534,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLine(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5466,7 +5556,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLine(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5485,14 +5575,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineCount(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMarginLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMarginLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5505,7 +5595,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginLeft(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetMarginLeft",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5521,7 +5611,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginLeft(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMarginLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMarginLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5540,14 +5630,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginLeft(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMarginRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMarginRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5560,7 +5650,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginRight(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetMarginRight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5576,7 +5666,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMarginRight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMarginRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMarginRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -5595,14 +5685,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMarginRight(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetModify(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetModify(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -5630,7 +5720,7 @@ static PyObject *_wrap_StyledTextCtrl_GetModify(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5645,9 +5735,9 @@ static PyObject *_wrap_StyledTextCtrl_SetSelection(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5663,7 +5753,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelection(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSelectedText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSelectedText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString result;
@@ -5695,7 +5785,7 @@ static PyObject *_wrap_StyledTextCtrl_GetSelectedText(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTextRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTextRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5711,9 +5801,9 @@ static PyObject *_wrap_StyledTextCtrl_GetTextRange(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_GetTextRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5735,7 +5825,7 @@ static PyObject *_wrap_StyledTextCtrl_GetTextRange(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HideSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HideSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -5748,7 +5838,7 @@ static PyObject *_wrap_StyledTextCtrl_HideSelection(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_HideSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5764,7 +5854,7 @@ static PyObject *_wrap_StyledTextCtrl_HideSelection(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineFromPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineFromPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5778,7 +5868,7 @@ static PyObject *_wrap_StyledTextCtrl_LineFromPosition(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_LineFromPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5787,14 +5877,14 @@ static PyObject *_wrap_StyledTextCtrl_LineFromPosition(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PositionFromLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PositionFromLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5808,7 +5898,7 @@ static PyObject *_wrap_StyledTextCtrl_PositionFromLine(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_PositionFromLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5817,14 +5907,14 @@ static PyObject *_wrap_StyledTextCtrl_PositionFromLine(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineScroll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineScroll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -5839,9 +5929,9 @@ static PyObject *_wrap_StyledTextCtrl_LineScroll(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_LineScroll",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5857,7 +5947,7 @@ static PyObject *_wrap_StyledTextCtrl_LineScroll(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_EnsureCaretVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_EnsureCaretVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5882,7 +5972,7 @@ static PyObject *_wrap_StyledTextCtrl_EnsureCaretVisible(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ReplaceSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ReplaceSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -5923,7 +6013,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceSelection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -5936,7 +6026,7 @@ static PyObject *_wrap_StyledTextCtrl_SetReadOnly(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetReadOnly",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5952,7 +6042,7 @@ static PyObject *_wrap_StyledTextCtrl_SetReadOnly(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CanPaste(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CanPaste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -5980,7 +6070,7 @@ static PyObject *_wrap_StyledTextCtrl_CanPaste(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CanUndo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -6008,7 +6098,7 @@ static PyObject *_wrap_StyledTextCtrl_CanUndo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_EmptyUndoBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_EmptyUndoBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6033,7 +6123,7 @@ static PyObject *_wrap_StyledTextCtrl_EmptyUndoBuffer(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Undo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Undo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6058,7 +6148,7 @@ static PyObject *_wrap_StyledTextCtrl_Undo(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Cut(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6083,7 +6173,7 @@ static PyObject *_wrap_StyledTextCtrl_Cut(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6108,7 +6198,7 @@ static PyObject *_wrap_StyledTextCtrl_Copy(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Paste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6133,7 +6223,7 @@ static PyObject *_wrap_StyledTextCtrl_Paste(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6158,7 +6248,7 @@ static PyObject *_wrap_StyledTextCtrl_Clear(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -6199,7 +6289,7 @@ static PyObject *_wrap_StyledTextCtrl_SetText(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString result;
@@ -6231,7 +6321,7 @@ static PyObject *_wrap_StyledTextCtrl_GetText(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTextLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTextLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -6250,14 +6340,14 @@ static PyObject *_wrap_StyledTextCtrl_GetTextLength(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetOvertype(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetOvertype(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -6270,7 +6360,7 @@ static PyObject *_wrap_StyledTextCtrl_SetOvertype(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetOvertype",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6286,7 +6376,7 @@ static PyObject *_wrap_StyledTextCtrl_SetOvertype(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetOvertype(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetOvertype(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -6314,7 +6404,7 @@ static PyObject *_wrap_StyledTextCtrl_GetOvertype(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCaretWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCaretWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6327,7 +6417,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretWidth(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetCaretWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6343,7 +6433,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCaretWidth(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCaretWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCaretWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -6362,14 +6452,14 @@ static PyObject *_wrap_StyledTextCtrl_GetCaretWidth(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetTargetStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetTargetStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6382,7 +6472,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTargetStart(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTargetStart",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6398,7 +6488,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTargetStart(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTargetStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTargetStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -6417,14 +6507,14 @@ static PyObject *_wrap_StyledTextCtrl_GetTargetStart(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetTargetEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetTargetEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6437,7 +6527,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTargetEnd(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTargetEnd",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6453,7 +6543,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTargetEnd(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTargetEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTargetEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -6472,14 +6562,14 @@ static PyObject *_wrap_StyledTextCtrl_GetTargetEnd(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ReplaceTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ReplaceTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -6506,7 +6596,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTarget(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -6521,7 +6611,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTarget(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ReplaceTargetRE(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ReplaceTargetRE(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -6548,7 +6638,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTargetRE(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -6563,7 +6653,7 @@ static PyObject *_wrap_StyledTextCtrl_ReplaceTargetRE(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SearchInTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SearchInTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -6590,7 +6680,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchInTarget(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -6605,7 +6695,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchInTarget(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSearchFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSearchFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6618,7 +6708,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSearchFlags(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetSearchFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6634,7 +6724,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSearchFlags(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSearchFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSearchFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -6653,14 +6743,14 @@ static PyObject *_wrap_StyledTextCtrl_GetSearchFlags(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipShow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6676,7 +6766,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipShow(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_CallTipShow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -6705,7 +6795,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipShow(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipCancel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipCancel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6730,7 +6820,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipCancel(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipActive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -6758,7 +6848,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipActive(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipPosAtStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipPosAtStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -6777,14 +6867,14 @@ static PyObject *_wrap_StyledTextCtrl_CallTipPosAtStart(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipSetHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipSetHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6799,9 +6889,9 @@ static PyObject *_wrap_StyledTextCtrl_CallTipSetHighlight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_CallTipSetHighlight",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6817,7 +6907,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipSetHighlight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipSetBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipSetBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -6849,7 +6939,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipSetBackground(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipSetForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipSetForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -6881,7 +6971,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipSetForeground(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CallTipSetForegroundHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CallTipSetForegroundHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -6913,7 +7003,7 @@ static PyObject *_wrap_StyledTextCtrl_CallTipSetForegroundHighlight(PyObject *se
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_VisibleFromDocLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_VisibleFromDocLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6927,7 +7017,7 @@ static PyObject *_wrap_StyledTextCtrl_VisibleFromDocLine(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_VisibleFromDocLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6936,14 +7026,14 @@ static PyObject *_wrap_StyledTextCtrl_VisibleFromDocLine(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DocLineFromVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DocLineFromVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6957,7 +7047,7 @@ static PyObject *_wrap_StyledTextCtrl_DocLineFromVisible(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_DocLineFromVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6966,14 +7056,14 @@ static PyObject *_wrap_StyledTextCtrl_DocLineFromVisible(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetFoldLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetFoldLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -6988,9 +7078,9 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldLevel(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetFoldLevel",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7006,7 +7096,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldLevel(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetFoldLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetFoldLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7020,7 +7110,7 @@ static PyObject *_wrap_StyledTextCtrl_GetFoldLevel(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetFoldLevel",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7029,14 +7119,14 @@ static PyObject *_wrap_StyledTextCtrl_GetFoldLevel(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLastChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLastChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7052,9 +7142,9 @@ static PyObject *_wrap_StyledTextCtrl_GetLastChild(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_GetLastChild",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7063,14 +7153,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLastChild(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetFoldParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetFoldParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7084,7 +7174,7 @@ static PyObject *_wrap_StyledTextCtrl_GetFoldParent(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetFoldParent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7093,14 +7183,14 @@ static PyObject *_wrap_StyledTextCtrl_GetFoldParent(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ShowLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ShowLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7115,9 +7205,9 @@ static PyObject *_wrap_StyledTextCtrl_ShowLines(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_ShowLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7133,7 +7223,7 @@ static PyObject *_wrap_StyledTextCtrl_ShowLines(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HideLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HideLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7148,9 +7238,9 @@ static PyObject *_wrap_StyledTextCtrl_HideLines(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_HideLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7166,7 +7256,7 @@ static PyObject *_wrap_StyledTextCtrl_HideLines(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7180,7 +7270,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineVisible(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7198,7 +7288,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineVisible(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetFoldExpanded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetFoldExpanded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7213,9 +7303,9 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldExpanded(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetFoldExpanded",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7231,7 +7321,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldExpanded(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetFoldExpanded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetFoldExpanded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7245,7 +7335,7 @@ static PyObject *_wrap_StyledTextCtrl_GetFoldExpanded(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetFoldExpanded",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7263,7 +7353,7 @@ static PyObject *_wrap_StyledTextCtrl_GetFoldExpanded(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ToggleFold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ToggleFold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7276,7 +7366,7 @@ static PyObject *_wrap_StyledTextCtrl_ToggleFold(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_ToggleFold",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7292,7 +7382,7 @@ static PyObject *_wrap_StyledTextCtrl_ToggleFold(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_EnsureVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7305,7 +7395,7 @@ static PyObject *_wrap_StyledTextCtrl_EnsureVisible(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_EnsureVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7321,7 +7411,7 @@ static PyObject *_wrap_StyledTextCtrl_EnsureVisible(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetFoldFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetFoldFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7334,7 +7424,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldFlags(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetFoldFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7350,7 +7440,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldFlags(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_EnsureVisibleEnforcePolicy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_EnsureVisibleEnforcePolicy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7363,7 +7453,7 @@ static PyObject *_wrap_StyledTextCtrl_EnsureVisibleEnforcePolicy(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_EnsureVisibleEnforcePolicy",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7379,7 +7469,7 @@ static PyObject *_wrap_StyledTextCtrl_EnsureVisibleEnforcePolicy(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetTabIndents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetTabIndents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -7392,7 +7482,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTabIndents(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTabIndents",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7408,7 +7498,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTabIndents(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTabIndents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTabIndents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -7436,7 +7526,7 @@ static PyObject *_wrap_StyledTextCtrl_GetTabIndents(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetBackSpaceUnIndents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetBackSpaceUnIndents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -7449,7 +7539,7 @@ static PyObject *_wrap_StyledTextCtrl_SetBackSpaceUnIndents(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetBackSpaceUnIndents",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7465,7 +7555,7 @@ static PyObject *_wrap_StyledTextCtrl_SetBackSpaceUnIndents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetBackSpaceUnIndents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetBackSpaceUnIndents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -7493,7 +7583,7 @@ static PyObject *_wrap_StyledTextCtrl_GetBackSpaceUnIndents(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMouseDwellTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMouseDwellTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7506,7 +7596,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMouseDwellTime(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetMouseDwellTime",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7522,7 +7612,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMouseDwellTime(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMouseDwellTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMouseDwellTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -7541,14 +7631,14 @@ static PyObject *_wrap_StyledTextCtrl_GetMouseDwellTime(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordStartPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordStartPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7564,9 +7654,9 @@ static PyObject *_wrap_StyledTextCtrl_WordStartPosition(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_WordStartPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7575,14 +7665,14 @@ static PyObject *_wrap_StyledTextCtrl_WordStartPosition(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordEndPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordEndPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7598,9 +7688,9 @@ static PyObject *_wrap_StyledTextCtrl_WordEndPosition(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_WordEndPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7609,14 +7699,14 @@ static PyObject *_wrap_StyledTextCtrl_WordEndPosition(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetWrapMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetWrapMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7629,7 +7719,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWrapMode(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetWrapMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7645,7 +7735,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWrapMode(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetWrapMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetWrapMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -7664,14 +7754,14 @@ static PyObject *_wrap_StyledTextCtrl_GetWrapMode(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetLayoutCache(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetLayoutCache(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7684,7 +7774,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLayoutCache(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetLayoutCache",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7700,7 +7790,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLayoutCache(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLayoutCache(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLayoutCache(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -7719,14 +7809,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLayoutCache(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetScrollWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetScrollWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7739,7 +7829,7 @@ static PyObject *_wrap_StyledTextCtrl_SetScrollWidth(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetScrollWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7755,7 +7845,7 @@ static PyObject *_wrap_StyledTextCtrl_SetScrollWidth(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetScrollWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetScrollWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -7774,14 +7864,14 @@ static PyObject *_wrap_StyledTextCtrl_GetScrollWidth(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7798,7 +7888,7 @@ static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_TextWidth",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -7812,7 +7902,7 @@ static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp3)
         delete arg3;
@@ -7827,7 +7917,7 @@ static PyObject *_wrap_StyledTextCtrl_TextWidth(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetEndAtLastLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetEndAtLastLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -7840,7 +7930,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEndAtLastLine(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetEndAtLastLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7856,7 +7946,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEndAtLastLine(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetEndAtLastLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetEndAtLastLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -7875,14 +7965,14 @@ static PyObject *_wrap_StyledTextCtrl_GetEndAtLastLine(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_TextHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_TextHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7896,7 +7986,7 @@ static PyObject *_wrap_StyledTextCtrl_TextHeight(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_TextHeight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7905,14 +7995,14 @@ static PyObject *_wrap_StyledTextCtrl_TextHeight(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetUseVerticalScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetUseVerticalScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -7925,7 +8015,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseVerticalScrollBar(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetUseVerticalScrollBar",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7941,7 +8031,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseVerticalScrollBar(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetUseVerticalScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetUseVerticalScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -7969,7 +8059,7 @@ static PyObject *_wrap_StyledTextCtrl_GetUseVerticalScrollBar(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -7985,7 +8075,7 @@ static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_AppendText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -8014,7 +8104,7 @@ static PyObject *_wrap_StyledTextCtrl_AppendText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetTwoPhaseDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetTwoPhaseDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -8042,7 +8132,7 @@ static PyObject *_wrap_StyledTextCtrl_GetTwoPhaseDraw(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetTwoPhaseDraw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetTwoPhaseDraw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -8055,7 +8145,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTwoPhaseDraw(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetTwoPhaseDraw",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8071,7 +8161,7 @@ static PyObject *_wrap_StyledTextCtrl_SetTwoPhaseDraw(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_TargetFromSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_TargetFromSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8096,7 +8186,7 @@ static PyObject *_wrap_StyledTextCtrl_TargetFromSelection(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LinesJoin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LinesJoin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8121,7 +8211,7 @@ static PyObject *_wrap_StyledTextCtrl_LinesJoin(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LinesSplit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LinesSplit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -8134,7 +8224,7 @@ static PyObject *_wrap_StyledTextCtrl_LinesSplit(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_LinesSplit",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8150,7 +8240,7 @@ static PyObject *_wrap_StyledTextCtrl_LinesSplit(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetFoldMarginColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetFoldMarginColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -8166,7 +8256,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldMarginColour(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetFoldMarginColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -8186,7 +8276,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldMarginColour(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetFoldMarginHiColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetFoldMarginHiColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -8202,7 +8292,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldMarginHiColour(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetFoldMarginHiColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -8222,7 +8312,7 @@ static PyObject *_wrap_StyledTextCtrl_SetFoldMarginHiColour(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8247,7 +8337,7 @@ static PyObject *_wrap_StyledTextCtrl_LineDown(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineDownExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineDownExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8272,7 +8362,7 @@ static PyObject *_wrap_StyledTextCtrl_LineDownExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8297,7 +8387,7 @@ static PyObject *_wrap_StyledTextCtrl_LineUp(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineUpExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineUpExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8322,7 +8412,7 @@ static PyObject *_wrap_StyledTextCtrl_LineUpExtend(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CharLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CharLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8347,7 +8437,7 @@ static PyObject *_wrap_StyledTextCtrl_CharLeft(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CharLeftExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CharLeftExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8372,7 +8462,7 @@ static PyObject *_wrap_StyledTextCtrl_CharLeftExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CharRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CharRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8397,7 +8487,7 @@ static PyObject *_wrap_StyledTextCtrl_CharRight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CharRightExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CharRightExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8422,7 +8512,7 @@ static PyObject *_wrap_StyledTextCtrl_CharRightExtend(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8447,7 +8537,7 @@ static PyObject *_wrap_StyledTextCtrl_WordLeft(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordLeftExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordLeftExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8472,7 +8562,7 @@ static PyObject *_wrap_StyledTextCtrl_WordLeftExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8497,7 +8587,7 @@ static PyObject *_wrap_StyledTextCtrl_WordRight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordRightExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordRightExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8522,7 +8612,7 @@ static PyObject *_wrap_StyledTextCtrl_WordRightExtend(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Home(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Home(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8547,7 +8637,7 @@ static PyObject *_wrap_StyledTextCtrl_Home(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HomeExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HomeExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8572,7 +8662,7 @@ static PyObject *_wrap_StyledTextCtrl_HomeExtend(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8597,7 +8687,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEnd(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEndExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEndExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8622,7 +8712,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEndExtend(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DocumentStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DocumentStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8647,7 +8737,7 @@ static PyObject *_wrap_StyledTextCtrl_DocumentStart(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DocumentStartExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DocumentStartExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8672,7 +8762,7 @@ static PyObject *_wrap_StyledTextCtrl_DocumentStartExtend(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DocumentEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DocumentEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8697,7 +8787,7 @@ static PyObject *_wrap_StyledTextCtrl_DocumentEnd(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DocumentEndExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DocumentEndExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8722,7 +8812,7 @@ static PyObject *_wrap_StyledTextCtrl_DocumentEndExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PageUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PageUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8747,7 +8837,7 @@ static PyObject *_wrap_StyledTextCtrl_PageUp(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PageUpExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PageUpExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8772,7 +8862,7 @@ static PyObject *_wrap_StyledTextCtrl_PageUpExtend(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PageDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PageDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8797,7 +8887,7 @@ static PyObject *_wrap_StyledTextCtrl_PageDown(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PageDownExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PageDownExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8822,7 +8912,7 @@ static PyObject *_wrap_StyledTextCtrl_PageDownExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_EditToggleOvertype(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_EditToggleOvertype(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8847,7 +8937,7 @@ static PyObject *_wrap_StyledTextCtrl_EditToggleOvertype(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Cancel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Cancel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8872,7 +8962,7 @@ static PyObject *_wrap_StyledTextCtrl_Cancel(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DeleteBack(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DeleteBack(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8897,7 +8987,7 @@ static PyObject *_wrap_StyledTextCtrl_DeleteBack(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Tab(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Tab(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8922,7 +9012,7 @@ static PyObject *_wrap_StyledTextCtrl_Tab(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_BackTab(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_BackTab(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8947,7 +9037,7 @@ static PyObject *_wrap_StyledTextCtrl_BackTab(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_NewLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_NewLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8972,7 +9062,7 @@ static PyObject *_wrap_StyledTextCtrl_NewLine(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_FormFeed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_FormFeed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8997,7 +9087,7 @@ static PyObject *_wrap_StyledTextCtrl_FormFeed(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_VCHome(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_VCHome(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9022,7 +9112,7 @@ static PyObject *_wrap_StyledTextCtrl_VCHome(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_VCHomeExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_VCHomeExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9047,7 +9137,7 @@ static PyObject *_wrap_StyledTextCtrl_VCHomeExtend(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ZoomIn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ZoomIn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9072,7 +9162,7 @@ static PyObject *_wrap_StyledTextCtrl_ZoomIn(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ZoomOut(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ZoomOut(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9097,7 +9187,7 @@ static PyObject *_wrap_StyledTextCtrl_ZoomOut(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DelWordLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DelWordLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9122,7 +9212,7 @@ static PyObject *_wrap_StyledTextCtrl_DelWordLeft(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DelWordRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DelWordRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9147,7 +9237,7 @@ static PyObject *_wrap_StyledTextCtrl_DelWordRight(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineCut(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineCut(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9172,7 +9262,7 @@ static PyObject *_wrap_StyledTextCtrl_LineCut(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9197,7 +9287,7 @@ static PyObject *_wrap_StyledTextCtrl_LineDelete(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineTranspose(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineTranspose(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9222,7 +9312,7 @@ static PyObject *_wrap_StyledTextCtrl_LineTranspose(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineDuplicate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineDuplicate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9247,7 +9337,7 @@ static PyObject *_wrap_StyledTextCtrl_LineDuplicate(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LowerCase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LowerCase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9272,7 +9362,7 @@ static PyObject *_wrap_StyledTextCtrl_LowerCase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_UpperCase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_UpperCase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9297,7 +9387,7 @@ static PyObject *_wrap_StyledTextCtrl_UpperCase(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineScrollDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineScrollDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9322,7 +9412,7 @@ static PyObject *_wrap_StyledTextCtrl_LineScrollDown(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineScrollUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineScrollUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9347,7 +9437,7 @@ static PyObject *_wrap_StyledTextCtrl_LineScrollUp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DeleteBackNotLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DeleteBackNotLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9372,7 +9462,7 @@ static PyObject *_wrap_StyledTextCtrl_DeleteBackNotLine(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HomeDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HomeDisplay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9397,7 +9487,7 @@ static PyObject *_wrap_StyledTextCtrl_HomeDisplay(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HomeDisplayExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HomeDisplayExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9422,7 +9512,7 @@ static PyObject *_wrap_StyledTextCtrl_HomeDisplayExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEndDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEndDisplay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9447,7 +9537,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEndDisplay(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEndDisplayExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEndDisplayExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9472,7 +9562,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEndDisplayExtend(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HomeWrap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HomeWrap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9497,7 +9587,7 @@ static PyObject *_wrap_StyledTextCtrl_HomeWrap(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HomeWrapExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HomeWrapExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9522,7 +9612,7 @@ static PyObject *_wrap_StyledTextCtrl_HomeWrapExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEndWrap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEndWrap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9547,7 +9637,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEndWrap(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEndWrapExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEndWrapExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9572,7 +9662,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEndWrapExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_VCHomeWrap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_VCHomeWrap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9597,7 +9687,7 @@ static PyObject *_wrap_StyledTextCtrl_VCHomeWrap(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_VCHomeWrapExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_VCHomeWrapExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9622,7 +9712,7 @@ static PyObject *_wrap_StyledTextCtrl_VCHomeWrapExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9647,7 +9737,7 @@ static PyObject *_wrap_StyledTextCtrl_LineCopy(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_MoveCaretInsideView(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_MoveCaretInsideView(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9672,7 +9762,7 @@ static PyObject *_wrap_StyledTextCtrl_MoveCaretInsideView(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -9686,7 +9776,7 @@ static PyObject *_wrap_StyledTextCtrl_LineLength(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_LineLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9695,14 +9785,14 @@ static PyObject *_wrap_StyledTextCtrl_LineLength(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_BraceHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_BraceHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -9717,9 +9807,9 @@ static PyObject *_wrap_StyledTextCtrl_BraceHighlight(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_BraceHighlight",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9735,7 +9825,7 @@ static PyObject *_wrap_StyledTextCtrl_BraceHighlight(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_BraceBadLight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_BraceBadLight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -9748,7 +9838,7 @@ static PyObject *_wrap_StyledTextCtrl_BraceBadLight(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_BraceBadLight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9764,7 +9854,7 @@ static PyObject *_wrap_StyledTextCtrl_BraceBadLight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_BraceMatch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_BraceMatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -9778,7 +9868,7 @@ static PyObject *_wrap_StyledTextCtrl_BraceMatch(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_BraceMatch",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9787,14 +9877,14 @@ static PyObject *_wrap_StyledTextCtrl_BraceMatch(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetViewEOL(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetViewEOL(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -9822,7 +9912,7 @@ static PyObject *_wrap_StyledTextCtrl_GetViewEOL(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetViewEOL(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetViewEOL(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -9835,7 +9925,7 @@ static PyObject *_wrap_StyledTextCtrl_SetViewEOL(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetViewEOL",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9851,7 +9941,7 @@ static PyObject *_wrap_StyledTextCtrl_SetViewEOL(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetDocPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetDocPointer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     void *result;
@@ -9877,7 +9967,7 @@ static PyObject *_wrap_StyledTextCtrl_GetDocPointer(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetDocPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetDocPointer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     void *arg2 = (void *) 0 ;
@@ -9905,7 +9995,7 @@ static PyObject *_wrap_StyledTextCtrl_SetDocPointer(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetModEventMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetModEventMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -9918,7 +10008,7 @@ static PyObject *_wrap_StyledTextCtrl_SetModEventMask(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetModEventMask",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9934,7 +10024,7 @@ static PyObject *_wrap_StyledTextCtrl_SetModEventMask(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetEdgeColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetEdgeColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -9953,14 +10043,14 @@ static PyObject *_wrap_StyledTextCtrl_GetEdgeColumn(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetEdgeColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetEdgeColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -9973,7 +10063,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEdgeColumn(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetEdgeColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9989,7 +10079,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEdgeColumn(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetEdgeMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetEdgeMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10008,14 +10098,14 @@ static PyObject *_wrap_StyledTextCtrl_GetEdgeMode(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetEdgeMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetEdgeMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10028,7 +10118,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEdgeMode(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetEdgeMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10044,7 +10134,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEdgeMode(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetEdgeColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetEdgeColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour result;
@@ -10074,7 +10164,7 @@ static PyObject *_wrap_StyledTextCtrl_GetEdgeColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetEdgeColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetEdgeColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10106,7 +10196,7 @@ static PyObject *_wrap_StyledTextCtrl_SetEdgeColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SearchAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SearchAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10131,7 +10221,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchAnchor(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10148,7 +10238,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SearchNext",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -10162,7 +10252,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp3)
         delete arg3;
@@ -10177,7 +10267,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchNext(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10194,7 +10284,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SearchPrev",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -10208,7 +10298,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp3)
         delete arg3;
@@ -10223,7 +10313,7 @@ static PyObject *_wrap_StyledTextCtrl_SearchPrev(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LinesOnScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LinesOnScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10242,14 +10332,14 @@ static PyObject *_wrap_StyledTextCtrl_LinesOnScreen(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_UsePopUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_UsePopUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -10262,7 +10352,7 @@ static PyObject *_wrap_StyledTextCtrl_UsePopUp(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_UsePopUp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10278,7 +10368,7 @@ static PyObject *_wrap_StyledTextCtrl_UsePopUp(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SelectionIsRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SelectionIsRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -10306,7 +10396,7 @@ static PyObject *_wrap_StyledTextCtrl_SelectionIsRectangle(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10319,7 +10409,7 @@ static PyObject *_wrap_StyledTextCtrl_SetZoom(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetZoom",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10335,7 +10425,7 @@ static PyObject *_wrap_StyledTextCtrl_SetZoom(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10354,14 +10444,14 @@ static PyObject *_wrap_StyledTextCtrl_GetZoom(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CreateDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CreateDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     void *result;
@@ -10387,7 +10477,7 @@ static PyObject *_wrap_StyledTextCtrl_CreateDocument(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AddRefDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AddRefDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     void *arg2 = (void *) 0 ;
@@ -10415,7 +10505,7 @@ static PyObject *_wrap_StyledTextCtrl_AddRefDocument(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ReleaseDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ReleaseDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     void *arg2 = (void *) 0 ;
@@ -10443,7 +10533,7 @@ static PyObject *_wrap_StyledTextCtrl_ReleaseDocument(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetModEventMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetModEventMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10462,14 +10552,14 @@ static PyObject *_wrap_StyledTextCtrl_GetModEventMask(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSTCFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSTCFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -10482,7 +10572,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSTCFocus(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetSTCFocus",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10498,7 +10588,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSTCFocus(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSTCFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSTCFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -10526,7 +10616,7 @@ static PyObject *_wrap_StyledTextCtrl_GetSTCFocus(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10539,7 +10629,7 @@ static PyObject *_wrap_StyledTextCtrl_SetStatus(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetStatus",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10555,7 +10645,7 @@ static PyObject *_wrap_StyledTextCtrl_SetStatus(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10574,14 +10664,14 @@ static PyObject *_wrap_StyledTextCtrl_GetStatus(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMouseDownCaptures(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMouseDownCaptures(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -10594,7 +10684,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMouseDownCaptures(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetMouseDownCaptures",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10610,7 +10700,7 @@ static PyObject *_wrap_StyledTextCtrl_SetMouseDownCaptures(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetMouseDownCaptures(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetMouseDownCaptures(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -10638,7 +10728,7 @@ static PyObject *_wrap_StyledTextCtrl_GetMouseDownCaptures(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSTCCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10651,7 +10741,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSTCCursor(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetSTCCursor",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10667,7 +10757,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSTCCursor(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSTCCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSTCCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10686,14 +10776,14 @@ static PyObject *_wrap_StyledTextCtrl_GetSTCCursor(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetControlCharSymbol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetControlCharSymbol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10706,7 +10796,7 @@ static PyObject *_wrap_StyledTextCtrl_SetControlCharSymbol(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetControlCharSymbol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10722,7 +10812,7 @@ static PyObject *_wrap_StyledTextCtrl_SetControlCharSymbol(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetControlCharSymbol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetControlCharSymbol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10741,14 +10831,14 @@ static PyObject *_wrap_StyledTextCtrl_GetControlCharSymbol(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordPartLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordPartLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10773,7 +10863,7 @@ static PyObject *_wrap_StyledTextCtrl_WordPartLeft(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordPartLeftExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordPartLeftExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10798,7 +10888,7 @@ static PyObject *_wrap_StyledTextCtrl_WordPartLeftExtend(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordPartRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordPartRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10823,7 +10913,7 @@ static PyObject *_wrap_StyledTextCtrl_WordPartRight(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordPartRightExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordPartRightExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10848,7 +10938,7 @@ static PyObject *_wrap_StyledTextCtrl_WordPartRightExtend(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetVisiblePolicy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetVisiblePolicy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10863,9 +10953,9 @@ static PyObject *_wrap_StyledTextCtrl_SetVisiblePolicy(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetVisiblePolicy",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10881,7 +10971,7 @@ static PyObject *_wrap_StyledTextCtrl_SetVisiblePolicy(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DelLineLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DelLineLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10906,7 +10996,7 @@ static PyObject *_wrap_StyledTextCtrl_DelLineLeft(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DelLineRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DelLineRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10931,7 +11021,7 @@ static PyObject *_wrap_StyledTextCtrl_DelLineRight(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -10944,7 +11034,7 @@ static PyObject *_wrap_StyledTextCtrl_SetXOffset(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetXOffset",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10960,7 +11050,7 @@ static PyObject *_wrap_StyledTextCtrl_SetXOffset(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetXOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetXOffset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -10979,14 +11069,14 @@ static PyObject *_wrap_StyledTextCtrl_GetXOffset(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ChooseCaretX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ChooseCaretX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11011,7 +11101,7 @@ static PyObject *_wrap_StyledTextCtrl_ChooseCaretX(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetXCaretPolicy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetXCaretPolicy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11026,9 +11116,9 @@ static PyObject *_wrap_StyledTextCtrl_SetXCaretPolicy(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetXCaretPolicy",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11044,7 +11134,7 @@ static PyObject *_wrap_StyledTextCtrl_SetXCaretPolicy(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetYCaretPolicy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetYCaretPolicy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11059,9 +11149,9 @@ static PyObject *_wrap_StyledTextCtrl_SetYCaretPolicy(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetYCaretPolicy",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11077,7 +11167,7 @@ static PyObject *_wrap_StyledTextCtrl_SetYCaretPolicy(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetPrintWrapMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetPrintWrapMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11090,7 +11180,7 @@ static PyObject *_wrap_StyledTextCtrl_SetPrintWrapMode(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetPrintWrapMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11106,7 +11196,7 @@ static PyObject *_wrap_StyledTextCtrl_SetPrintWrapMode(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetPrintWrapMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetPrintWrapMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -11125,14 +11215,14 @@ static PyObject *_wrap_StyledTextCtrl_GetPrintWrapMode(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -11148,7 +11238,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveForeground(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetHotspotActiveForeground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -11168,7 +11258,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveForeground(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -11184,7 +11274,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveBackground(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetHotspotActiveBackground",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -11204,7 +11294,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveBackground(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveUnderline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveUnderline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -11217,7 +11307,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveUnderline(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetHotspotActiveUnderline",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11233,7 +11323,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotActiveUnderline(PyObject *self,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetHotspotSingleLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetHotspotSingleLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -11246,7 +11336,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotSingleLine(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetHotspotSingleLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11262,7 +11352,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHotspotSingleLine(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ParaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ParaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11287,7 +11377,7 @@ static PyObject *_wrap_StyledTextCtrl_ParaDown(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ParaDownExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ParaDownExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11312,7 +11402,7 @@ static PyObject *_wrap_StyledTextCtrl_ParaDownExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ParaUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ParaUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11337,7 +11427,7 @@ static PyObject *_wrap_StyledTextCtrl_ParaUp(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ParaUpExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ParaUpExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11362,7 +11452,7 @@ static PyObject *_wrap_StyledTextCtrl_ParaUpExtend(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PositionBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PositionBefore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11376,7 +11466,7 @@ static PyObject *_wrap_StyledTextCtrl_PositionBefore(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_PositionBefore",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11385,14 +11475,14 @@ static PyObject *_wrap_StyledTextCtrl_PositionBefore(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PositionAfter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PositionAfter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11406,7 +11496,7 @@ static PyObject *_wrap_StyledTextCtrl_PositionAfter(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_PositionAfter",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11415,14 +11505,14 @@ static PyObject *_wrap_StyledTextCtrl_PositionAfter(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CopyRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CopyRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11437,9 +11527,9 @@ static PyObject *_wrap_StyledTextCtrl_CopyRange(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_CopyRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11455,7 +11545,7 @@ static PyObject *_wrap_StyledTextCtrl_CopyRange(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CopyText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CopyText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11471,7 +11561,7 @@ static PyObject *_wrap_StyledTextCtrl_CopyText(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_CopyText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -11500,7 +11590,7 @@ static PyObject *_wrap_StyledTextCtrl_CopyText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetSelectionMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetSelectionMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11513,7 +11603,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelectionMode(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetSelectionMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11529,7 +11619,7 @@ static PyObject *_wrap_StyledTextCtrl_SetSelectionMode(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSelectionMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSelectionMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -11548,14 +11638,14 @@ static PyObject *_wrap_StyledTextCtrl_GetSelectionMode(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineSelStartPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineSelStartPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11569,7 +11659,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineSelStartPosition(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineSelStartPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11578,14 +11668,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineSelStartPosition(PyObject *self, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLineSelEndPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLineSelEndPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -11599,7 +11689,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLineSelEndPosition(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_GetLineSelEndPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11608,14 +11698,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLineSelEndPosition(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineDownRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineDownRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11640,7 +11730,7 @@ static PyObject *_wrap_StyledTextCtrl_LineDownRectExtend(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineUpRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineUpRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11665,7 +11755,7 @@ static PyObject *_wrap_StyledTextCtrl_LineUpRectExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CharLeftRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CharLeftRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11690,7 +11780,7 @@ static PyObject *_wrap_StyledTextCtrl_CharLeftRectExtend(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CharRightRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CharRightRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11715,7 +11805,7 @@ static PyObject *_wrap_StyledTextCtrl_CharRightRectExtend(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_HomeRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_HomeRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11740,7 +11830,7 @@ static PyObject *_wrap_StyledTextCtrl_HomeRectExtend(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_VCHomeRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_VCHomeRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11765,7 +11855,7 @@ static PyObject *_wrap_StyledTextCtrl_VCHomeRectExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LineEndRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LineEndRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11790,7 +11880,7 @@ static PyObject *_wrap_StyledTextCtrl_LineEndRectExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PageUpRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PageUpRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11815,7 +11905,7 @@ static PyObject *_wrap_StyledTextCtrl_PageUpRectExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PageDownRectExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PageDownRectExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11840,7 +11930,7 @@ static PyObject *_wrap_StyledTextCtrl_PageDownRectExtend(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StutteredPageUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StutteredPageUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11865,7 +11955,7 @@ static PyObject *_wrap_StyledTextCtrl_StutteredPageUp(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StutteredPageUpExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StutteredPageUpExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11890,7 +11980,7 @@ static PyObject *_wrap_StyledTextCtrl_StutteredPageUpExtend(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StutteredPageDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StutteredPageDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11915,7 +12005,7 @@ static PyObject *_wrap_StyledTextCtrl_StutteredPageDown(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StutteredPageDownExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StutteredPageDownExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11940,7 +12030,7 @@ static PyObject *_wrap_StyledTextCtrl_StutteredPageDownExtend(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordLeftEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordLeftEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11965,7 +12055,7 @@ static PyObject *_wrap_StyledTextCtrl_WordLeftEnd(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordLeftEndExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordLeftEndExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11990,7 +12080,7 @@ static PyObject *_wrap_StyledTextCtrl_WordLeftEndExtend(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordRightEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordRightEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12015,7 +12105,7 @@ static PyObject *_wrap_StyledTextCtrl_WordRightEnd(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_WordRightEndExtend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_WordRightEndExtend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12040,7 +12130,7 @@ static PyObject *_wrap_StyledTextCtrl_WordRightEndExtend(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetWhitespaceChars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetWhitespaceChars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -12081,7 +12171,7 @@ static PyObject *_wrap_StyledTextCtrl_SetWhitespaceChars(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetCharsDefault(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetCharsDefault(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12106,7 +12196,7 @@ static PyObject *_wrap_StyledTextCtrl_SetCharsDefault(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_AutoCompGetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_AutoCompGetCurrent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -12125,14 +12215,14 @@ static PyObject *_wrap_StyledTextCtrl_AutoCompGetCurrent(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12157,7 +12247,7 @@ static PyObject *_wrap_StyledTextCtrl_StartRecord(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StopRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StopRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12182,7 +12272,7 @@ static PyObject *_wrap_StyledTextCtrl_StopRecord(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetLexer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetLexer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12195,7 +12285,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLexer(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetLexer",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12211,7 +12301,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLexer(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLexer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLexer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -12230,14 +12320,14 @@ static PyObject *_wrap_StyledTextCtrl_GetLexer(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_Colourise(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_Colourise(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12252,9 +12342,9 @@ static PyObject *_wrap_StyledTextCtrl_Colourise(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_Colourise",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12270,7 +12360,7 @@ static PyObject *_wrap_StyledTextCtrl_Colourise(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetProperty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetProperty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -12327,7 +12417,7 @@ static PyObject *_wrap_StyledTextCtrl_SetProperty(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetKeyWords(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetKeyWords(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12343,7 +12433,7 @@ static PyObject *_wrap_StyledTextCtrl_SetKeyWords(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetKeyWords",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -12372,7 +12462,7 @@ static PyObject *_wrap_StyledTextCtrl_SetKeyWords(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetLexerLanguage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetLexerLanguage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -12413,7 +12503,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLexerLanguage(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetCurrentLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetCurrentLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int result;
@@ -12432,14 +12522,14 @@ static PyObject *_wrap_StyledTextCtrl_GetCurrentLine(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetSpec(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetSpec(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12455,7 +12545,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetSpec(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetSpec",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -12484,7 +12574,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetSpec(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12499,7 +12589,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFont(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_StyleSetFont",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxFont,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -12522,7 +12612,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFont(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_StyleSetFontAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_StyleSetFontAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12546,20 +12636,20 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFontAttr(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:StyledTextCtrl_StyleSetFontAttr",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
         if (arg4 == NULL) SWIG_fail;
         temp4 = True;
     }
-    arg5 = (bool) SWIG_AsBool(obj4); 
+    arg5 = (bool)SWIG_As_bool(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (bool) SWIG_AsBool(obj5); 
+    arg6 = (bool)SWIG_As_bool(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg7 = (bool) SWIG_AsBool(obj6); 
+    arg7 = (bool)SWIG_As_bool(obj6); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12583,7 +12673,7 @@ static PyObject *_wrap_StyledTextCtrl_StyleSetFontAttr(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_CmdKeyExecute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_CmdKeyExecute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12596,7 +12686,7 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyExecute(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_CmdKeyExecute",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12612,7 +12702,7 @@ static PyObject *_wrap_StyledTextCtrl_CmdKeyExecute(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12627,9 +12717,9 @@ static PyObject *_wrap_StyledTextCtrl_SetMargins(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:StyledTextCtrl_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12645,20 +12735,22 @@ static PyObject *_wrap_StyledTextCtrl_SetMargins(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetSelection",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -12670,21 +12762,17 @@ static PyObject *_wrap_StyledTextCtrl_GetSelection(PyObject *self, PyObject *arg
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_PointFromPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_PointFromPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12698,7 +12786,7 @@ static PyObject *_wrap_StyledTextCtrl_PointFromPosition(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_PointFromPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12718,7 +12806,7 @@ static PyObject *_wrap_StyledTextCtrl_PointFromPosition(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ScrollToLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ScrollToLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12731,7 +12819,7 @@ static PyObject *_wrap_StyledTextCtrl_ScrollToLine(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_ScrollToLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12747,7 +12835,7 @@ static PyObject *_wrap_StyledTextCtrl_ScrollToLine(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_ScrollToColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_ScrollToColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12760,7 +12848,7 @@ static PyObject *_wrap_StyledTextCtrl_ScrollToColumn(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_ScrollToColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12776,7 +12864,7 @@ static PyObject *_wrap_StyledTextCtrl_ScrollToColumn(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SendMsg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SendMsg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -12794,14 +12882,14 @@ static PyObject *_wrap_StyledTextCtrl_SendMsg(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:StyledTextCtrl_SendMsg",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (long) SWIG_AsLong(obj3); 
+        arg4 = (long)SWIG_As_long(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12811,14 +12899,14 @@ static PyObject *_wrap_StyledTextCtrl_SendMsg(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetVScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetVScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxScrollBar *arg2 = (wxScrollBar *) 0 ;
@@ -12847,7 +12935,7 @@ static PyObject *_wrap_StyledTextCtrl_SetVScrollBar(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetHScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetHScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxScrollBar *arg2 = (wxScrollBar *) 0 ;
@@ -12876,7 +12964,7 @@ static PyObject *_wrap_StyledTextCtrl_SetHScrollBar(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetLastKeydownProcessed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetLastKeydownProcessed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -12904,7 +12992,7 @@ static PyObject *_wrap_StyledTextCtrl_GetLastKeydownProcessed(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetLastKeydownProcessed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetLastKeydownProcessed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -12917,7 +13005,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLastKeydownProcessed(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetLastKeydownProcessed",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12933,7 +13021,7 @@ static PyObject *_wrap_StyledTextCtrl_SetLastKeydownProcessed(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SaveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -12977,7 +13065,7 @@ static PyObject *_wrap_StyledTextCtrl_SaveFile(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -13021,7 +13109,7 @@ static PyObject *_wrap_StyledTextCtrl_LoadFile(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DoDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DoDragOver(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     int arg2 ;
@@ -13039,11 +13127,11 @@ static PyObject *_wrap_StyledTextCtrl_DoDragOver(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:StyledTextCtrl_DoDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13052,14 +13140,14 @@ static PyObject *_wrap_StyledTextCtrl_DoDragOver(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     long arg2 ;
@@ -13078,9 +13166,9 @@ static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:StyledTextCtrl_DoDropText",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -13111,7 +13199,7 @@ static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_SetUseAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_SetUseAntiAliasing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool arg2 ;
@@ -13124,7 +13212,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseAntiAliasing(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetUseAntiAliasing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13140,7 +13228,7 @@ static PyObject *_wrap_StyledTextCtrl_SetUseAntiAliasing(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_StyledTextCtrl_GetUseAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextCtrl_GetUseAntiAliasing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
     bool result;
@@ -13168,14 +13256,14 @@ static PyObject *_wrap_StyledTextCtrl_GetUseAntiAliasing(PyObject *self, PyObjec
 }
 
 
-static PyObject * StyledTextCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StyledTextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStyledTextCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StyledTextEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StyledTextEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) 0 ;
     int arg2 = (int) 0 ;
@@ -13188,11 +13276,11 @@ static PyObject *_wrap_new_StyledTextEvent(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_StyledTextEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13209,7 +13297,7 @@ static PyObject *_wrap_new_StyledTextEvent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_delete_StyledTextEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_StyledTextEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13234,7 +13322,7 @@ static PyObject *_wrap_delete_StyledTextEvent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13247,7 +13335,7 @@ static PyObject *_wrap_StyledTextEvent_SetPosition(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13263,7 +13351,7 @@ static PyObject *_wrap_StyledTextEvent_SetPosition(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13276,7 +13364,7 @@ static PyObject *_wrap_StyledTextEvent_SetKey(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetKey",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13292,7 +13380,7 @@ static PyObject *_wrap_StyledTextEvent_SetKey(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetModifiers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetModifiers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13305,7 +13393,7 @@ static PyObject *_wrap_StyledTextEvent_SetModifiers(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetModifiers",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13321,7 +13409,7 @@ static PyObject *_wrap_StyledTextEvent_SetModifiers(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetModificationType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetModificationType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13334,7 +13422,7 @@ static PyObject *_wrap_StyledTextEvent_SetModificationType(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetModificationType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13350,7 +13438,7 @@ static PyObject *_wrap_StyledTextEvent_SetModificationType(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -13391,7 +13479,7 @@ static PyObject *_wrap_StyledTextEvent_SetText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13404,7 +13492,7 @@ static PyObject *_wrap_StyledTextEvent_SetLength(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13420,7 +13508,7 @@ static PyObject *_wrap_StyledTextEvent_SetLength(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetLinesAdded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetLinesAdded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13433,7 +13521,7 @@ static PyObject *_wrap_StyledTextEvent_SetLinesAdded(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetLinesAdded",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13449,7 +13537,7 @@ static PyObject *_wrap_StyledTextEvent_SetLinesAdded(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13462,7 +13550,7 @@ static PyObject *_wrap_StyledTextEvent_SetLine(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13478,7 +13566,7 @@ static PyObject *_wrap_StyledTextEvent_SetLine(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetFoldLevelNow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetFoldLevelNow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13491,7 +13579,7 @@ static PyObject *_wrap_StyledTextEvent_SetFoldLevelNow(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetFoldLevelNow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13507,7 +13595,7 @@ static PyObject *_wrap_StyledTextEvent_SetFoldLevelNow(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetFoldLevelPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetFoldLevelPrev(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13520,7 +13608,7 @@ static PyObject *_wrap_StyledTextEvent_SetFoldLevelPrev(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetFoldLevelPrev",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13536,7 +13624,7 @@ static PyObject *_wrap_StyledTextEvent_SetFoldLevelPrev(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetMargin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13549,7 +13637,7 @@ static PyObject *_wrap_StyledTextEvent_SetMargin(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetMargin",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13565,7 +13653,7 @@ static PyObject *_wrap_StyledTextEvent_SetMargin(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13578,7 +13666,7 @@ static PyObject *_wrap_StyledTextEvent_SetMessage(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetMessage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13594,7 +13682,7 @@ static PyObject *_wrap_StyledTextEvent_SetMessage(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetWParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetWParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13607,7 +13695,7 @@ static PyObject *_wrap_StyledTextEvent_SetWParam(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetWParam",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13623,7 +13711,7 @@ static PyObject *_wrap_StyledTextEvent_SetWParam(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetLParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetLParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13636,7 +13724,7 @@ static PyObject *_wrap_StyledTextEvent_SetLParam(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetLParam",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13652,7 +13740,7 @@ static PyObject *_wrap_StyledTextEvent_SetLParam(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetListType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetListType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13665,7 +13753,7 @@ static PyObject *_wrap_StyledTextEvent_SetListType(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetListType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13681,7 +13769,7 @@ static PyObject *_wrap_StyledTextEvent_SetListType(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13694,7 +13782,7 @@ static PyObject *_wrap_StyledTextEvent_SetX(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13710,7 +13798,7 @@ static PyObject *_wrap_StyledTextEvent_SetX(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13723,7 +13811,7 @@ static PyObject *_wrap_StyledTextEvent_SetY(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13739,7 +13827,7 @@ static PyObject *_wrap_StyledTextEvent_SetY(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetDragText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetDragText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -13780,7 +13868,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragText(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetDragAllowMove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetDragAllowMove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     bool arg2 ;
@@ -13793,7 +13881,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragAllowMove(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetDragAllowMove",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13809,7 +13897,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragAllowMove(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextEvent_SetDragResult(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_SetDragResult(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int arg2 ;
@@ -13822,7 +13910,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragResult(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextEvent_SetDragResult",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStyledTextEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDragResult) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13838,7 +13926,7 @@ static PyObject *_wrap_StyledTextEvent_SetDragResult(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -13857,14 +13945,14 @@ static PyObject *_wrap_StyledTextEvent_GetPosition(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -13883,14 +13971,14 @@ static PyObject *_wrap_StyledTextEvent_GetKey(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetModifiers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetModifiers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -13909,14 +13997,14 @@ static PyObject *_wrap_StyledTextEvent_GetModifiers(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetModificationType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetModificationType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -13935,14 +14023,14 @@ static PyObject *_wrap_StyledTextEvent_GetModificationType(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxString result;
@@ -13974,7 +14062,7 @@ static PyObject *_wrap_StyledTextEvent_GetText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -13993,14 +14081,14 @@ static PyObject *_wrap_StyledTextEvent_GetLength(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetLinesAdded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetLinesAdded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14019,14 +14107,14 @@ static PyObject *_wrap_StyledTextEvent_GetLinesAdded(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14045,14 +14133,14 @@ static PyObject *_wrap_StyledTextEvent_GetLine(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetFoldLevelNow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetFoldLevelNow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14071,14 +14159,14 @@ static PyObject *_wrap_StyledTextEvent_GetFoldLevelNow(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetFoldLevelPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetFoldLevelPrev(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14097,14 +14185,14 @@ static PyObject *_wrap_StyledTextEvent_GetFoldLevelPrev(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetMargin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14123,14 +14211,14 @@ static PyObject *_wrap_StyledTextEvent_GetMargin(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14149,14 +14237,14 @@ static PyObject *_wrap_StyledTextEvent_GetMessage(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetWParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetWParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14175,14 +14263,14 @@ static PyObject *_wrap_StyledTextEvent_GetWParam(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetLParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetLParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14201,14 +14289,14 @@ static PyObject *_wrap_StyledTextEvent_GetLParam(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetListType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetListType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14227,14 +14315,14 @@ static PyObject *_wrap_StyledTextEvent_GetListType(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14253,14 +14341,14 @@ static PyObject *_wrap_StyledTextEvent_GetX(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14279,14 +14367,14 @@ static PyObject *_wrap_StyledTextEvent_GetY(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetDragText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetDragText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxString result;
@@ -14318,7 +14406,7 @@ static PyObject *_wrap_StyledTextEvent_GetDragText(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetDragAllowMove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetDragAllowMove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     bool result;
@@ -14346,7 +14434,7 @@ static PyObject *_wrap_StyledTextEvent_GetDragAllowMove(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetDragResult(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetDragResult(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     int result;
@@ -14365,14 +14453,14 @@ static PyObject *_wrap_StyledTextEvent_GetDragResult(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetShift(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetShift(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     bool result;
@@ -14400,7 +14488,7 @@ static PyObject *_wrap_StyledTextEvent_GetShift(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     bool result;
@@ -14428,7 +14516,7 @@ static PyObject *_wrap_StyledTextEvent_GetControl(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_StyledTextEvent_GetAlt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_GetAlt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     bool result;
@@ -14456,7 +14544,7 @@ static PyObject *_wrap_StyledTextEvent_GetAlt(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StyledTextEvent_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StyledTextEvent_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStyledTextEvent *arg1 = (wxStyledTextEvent *) 0 ;
     wxEvent *result;
@@ -14482,7 +14570,7 @@ static PyObject *_wrap_StyledTextEvent_Clone(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * StyledTextEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StyledTextEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStyledTextEvent, obj);
@@ -14490,477 +14578,477 @@ static PyObject * StyledTextEvent_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_StyledTextCtrl", (PyCFunction) _wrap_new_StyledTextCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreStyledTextCtrl", (PyCFunction) _wrap_new_PreStyledTextCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Create", (PyCFunction) _wrap_StyledTextCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AddText", (PyCFunction) _wrap_StyledTextCtrl_AddText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AddStyledText", (PyCFunction) _wrap_StyledTextCtrl_AddStyledText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_InsertText", (PyCFunction) _wrap_StyledTextCtrl_InsertText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ClearAll", (PyCFunction) _wrap_StyledTextCtrl_ClearAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ClearDocumentStyle", (PyCFunction) _wrap_StyledTextCtrl_ClearDocumentStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLength", (PyCFunction) _wrap_StyledTextCtrl_GetLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCharAt", (PyCFunction) _wrap_StyledTextCtrl_GetCharAt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCurrentPos", (PyCFunction) _wrap_StyledTextCtrl_GetCurrentPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetAnchor", (PyCFunction) _wrap_StyledTextCtrl_GetAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetStyleAt", (PyCFunction) _wrap_StyledTextCtrl_GetStyleAt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Redo", (PyCFunction) _wrap_StyledTextCtrl_Redo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetUndoCollection", (PyCFunction) _wrap_StyledTextCtrl_SetUndoCollection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SelectAll", (PyCFunction) _wrap_StyledTextCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSavePoint", (PyCFunction) _wrap_StyledTextCtrl_SetSavePoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetStyledText", (PyCFunction) _wrap_StyledTextCtrl_GetStyledText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CanRedo", (PyCFunction) _wrap_StyledTextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerLineFromHandle", (PyCFunction) _wrap_StyledTextCtrl_MarkerLineFromHandle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerDeleteHandle", (PyCFunction) _wrap_StyledTextCtrl_MarkerDeleteHandle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetUndoCollection", (PyCFunction) _wrap_StyledTextCtrl_GetUndoCollection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetViewWhiteSpace", (PyCFunction) _wrap_StyledTextCtrl_GetViewWhiteSpace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetViewWhiteSpace", (PyCFunction) _wrap_StyledTextCtrl_SetViewWhiteSpace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PositionFromPoint", (PyCFunction) _wrap_StyledTextCtrl_PositionFromPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PositionFromPointClose", (PyCFunction) _wrap_StyledTextCtrl_PositionFromPointClose, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GotoLine", (PyCFunction) _wrap_StyledTextCtrl_GotoLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GotoPos", (PyCFunction) _wrap_StyledTextCtrl_GotoPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetAnchor", (PyCFunction) _wrap_StyledTextCtrl_SetAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCurLine", (PyCFunction) _wrap_StyledTextCtrl_GetCurLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetEndStyled", (PyCFunction) _wrap_StyledTextCtrl_GetEndStyled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ConvertEOLs", (PyCFunction) _wrap_StyledTextCtrl_ConvertEOLs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetEOLMode", (PyCFunction) _wrap_StyledTextCtrl_GetEOLMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetEOLMode", (PyCFunction) _wrap_StyledTextCtrl_SetEOLMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StartStyling", (PyCFunction) _wrap_StyledTextCtrl_StartStyling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetStyling", (PyCFunction) _wrap_StyledTextCtrl_SetStyling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetBufferedDraw", (PyCFunction) _wrap_StyledTextCtrl_GetBufferedDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetBufferedDraw", (PyCFunction) _wrap_StyledTextCtrl_SetBufferedDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetTabWidth", (PyCFunction) _wrap_StyledTextCtrl_SetTabWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTabWidth", (PyCFunction) _wrap_StyledTextCtrl_GetTabWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCodePage", (PyCFunction) _wrap_StyledTextCtrl_SetCodePage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerDefine", (PyCFunction) _wrap_StyledTextCtrl_MarkerDefine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerSetForeground", (PyCFunction) _wrap_StyledTextCtrl_MarkerSetForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerSetBackground", (PyCFunction) _wrap_StyledTextCtrl_MarkerSetBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerAdd", (PyCFunction) _wrap_StyledTextCtrl_MarkerAdd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerDelete", (PyCFunction) _wrap_StyledTextCtrl_MarkerDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerDeleteAll", (PyCFunction) _wrap_StyledTextCtrl_MarkerDeleteAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerGet", (PyCFunction) _wrap_StyledTextCtrl_MarkerGet, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerNext", (PyCFunction) _wrap_StyledTextCtrl_MarkerNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerPrevious", (PyCFunction) _wrap_StyledTextCtrl_MarkerPrevious, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MarkerDefineBitmap", (PyCFunction) _wrap_StyledTextCtrl_MarkerDefineBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMarginType", (PyCFunction) _wrap_StyledTextCtrl_SetMarginType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMarginType", (PyCFunction) _wrap_StyledTextCtrl_GetMarginType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMarginWidth", (PyCFunction) _wrap_StyledTextCtrl_SetMarginWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMarginWidth", (PyCFunction) _wrap_StyledTextCtrl_GetMarginWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMarginMask", (PyCFunction) _wrap_StyledTextCtrl_SetMarginMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMarginMask", (PyCFunction) _wrap_StyledTextCtrl_GetMarginMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMarginSensitive", (PyCFunction) _wrap_StyledTextCtrl_SetMarginSensitive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMarginSensitive", (PyCFunction) _wrap_StyledTextCtrl_GetMarginSensitive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleClearAll", (PyCFunction) _wrap_StyledTextCtrl_StyleClearAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetForeground", (PyCFunction) _wrap_StyledTextCtrl_StyleSetForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetBackground", (PyCFunction) _wrap_StyledTextCtrl_StyleSetBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetBold", (PyCFunction) _wrap_StyledTextCtrl_StyleSetBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetItalic", (PyCFunction) _wrap_StyledTextCtrl_StyleSetItalic, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetSize", (PyCFunction) _wrap_StyledTextCtrl_StyleSetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetFaceName", (PyCFunction) _wrap_StyledTextCtrl_StyleSetFaceName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetEOLFilled", (PyCFunction) _wrap_StyledTextCtrl_StyleSetEOLFilled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleResetDefault", (PyCFunction) _wrap_StyledTextCtrl_StyleResetDefault, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetUnderline", (PyCFunction) _wrap_StyledTextCtrl_StyleSetUnderline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetCase", (PyCFunction) _wrap_StyledTextCtrl_StyleSetCase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetCharacterSet", (PyCFunction) _wrap_StyledTextCtrl_StyleSetCharacterSet, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetHotSpot", (PyCFunction) _wrap_StyledTextCtrl_StyleSetHotSpot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSelForeground", (PyCFunction) _wrap_StyledTextCtrl_SetSelForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSelBackground", (PyCFunction) _wrap_StyledTextCtrl_SetSelBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCaretForeground", (PyCFunction) _wrap_StyledTextCtrl_SetCaretForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CmdKeyAssign", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyAssign, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CmdKeyClear", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyClear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CmdKeyClearAll", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyClearAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetStyleBytes", (PyCFunction) _wrap_StyledTextCtrl_SetStyleBytes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetVisible", (PyCFunction) _wrap_StyledTextCtrl_StyleSetVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCaretPeriod", (PyCFunction) _wrap_StyledTextCtrl_GetCaretPeriod, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCaretPeriod", (PyCFunction) _wrap_StyledTextCtrl_SetCaretPeriod, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetWordChars", (PyCFunction) _wrap_StyledTextCtrl_SetWordChars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_BeginUndoAction", (PyCFunction) _wrap_StyledTextCtrl_BeginUndoAction, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_EndUndoAction", (PyCFunction) _wrap_StyledTextCtrl_EndUndoAction, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_IndicatorSetStyle", (PyCFunction) _wrap_StyledTextCtrl_IndicatorSetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_IndicatorGetStyle", (PyCFunction) _wrap_StyledTextCtrl_IndicatorGetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_IndicatorSetForeground", (PyCFunction) _wrap_StyledTextCtrl_IndicatorSetForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_IndicatorGetForeground", (PyCFunction) _wrap_StyledTextCtrl_IndicatorGetForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetWhitespaceForeground", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetWhitespaceBackground", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetStyleBits", (PyCFunction) _wrap_StyledTextCtrl_SetStyleBits, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetStyleBits", (PyCFunction) _wrap_StyledTextCtrl_GetStyleBits, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetLineState", (PyCFunction) _wrap_StyledTextCtrl_SetLineState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineState", (PyCFunction) _wrap_StyledTextCtrl_GetLineState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMaxLineState", (PyCFunction) _wrap_StyledTextCtrl_GetMaxLineState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCaretLineVisible", (PyCFunction) _wrap_StyledTextCtrl_GetCaretLineVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCaretLineVisible", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCaretLineBack", (PyCFunction) _wrap_StyledTextCtrl_GetCaretLineBack, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCaretLineBack", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineBack, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetChangeable", (PyCFunction) _wrap_StyledTextCtrl_StyleSetChangeable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompShow", (PyCFunction) _wrap_StyledTextCtrl_AutoCompShow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompCancel", (PyCFunction) _wrap_StyledTextCtrl_AutoCompCancel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompActive", (PyCFunction) _wrap_StyledTextCtrl_AutoCompActive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompPosStart", (PyCFunction) _wrap_StyledTextCtrl_AutoCompPosStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompComplete", (PyCFunction) _wrap_StyledTextCtrl_AutoCompComplete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompStops", (PyCFunction) _wrap_StyledTextCtrl_AutoCompStops, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSelect", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSelect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetCancelAtStart", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetCancelAtStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetCancelAtStart", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCancelAtStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetFillUps", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetFillUps, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetChooseSingle", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetChooseSingle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetChooseSingle", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetChooseSingle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetIgnoreCase", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetIgnoreCase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetIgnoreCase", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetIgnoreCase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_UserListShow", (PyCFunction) _wrap_StyledTextCtrl_UserListShow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetAutoHide", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetAutoHide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetAutoHide", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetAutoHide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetDropRestOfWord", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetDropRestOfWord, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetDropRestOfWord", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetDropRestOfWord, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_RegisterImage", (PyCFunction) _wrap_StyledTextCtrl_RegisterImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ClearRegisteredImages", (PyCFunction) _wrap_StyledTextCtrl_ClearRegisteredImages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetTypeSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetTypeSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompSetTypeSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetTypeSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetIndent", (PyCFunction) _wrap_StyledTextCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetIndent", (PyCFunction) _wrap_StyledTextCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetUseTabs", (PyCFunction) _wrap_StyledTextCtrl_SetUseTabs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetUseTabs", (PyCFunction) _wrap_StyledTextCtrl_GetUseTabs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetLineIndentation", (PyCFunction) _wrap_StyledTextCtrl_SetLineIndentation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineIndentation", (PyCFunction) _wrap_StyledTextCtrl_GetLineIndentation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineIndentPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineIndentPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetColumn", (PyCFunction) _wrap_StyledTextCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetUseHorizontalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetUseHorizontalScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetUseHorizontalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_GetUseHorizontalScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetIndentationGuides", (PyCFunction) _wrap_StyledTextCtrl_SetIndentationGuides, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetIndentationGuides", (PyCFunction) _wrap_StyledTextCtrl_GetIndentationGuides, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetHighlightGuide", (PyCFunction) _wrap_StyledTextCtrl_SetHighlightGuide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetHighlightGuide", (PyCFunction) _wrap_StyledTextCtrl_GetHighlightGuide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineEndPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineEndPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCodePage", (PyCFunction) _wrap_StyledTextCtrl_GetCodePage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCaretForeground", (PyCFunction) _wrap_StyledTextCtrl_GetCaretForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetReadOnly", (PyCFunction) _wrap_StyledTextCtrl_GetReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCurrentPos", (PyCFunction) _wrap_StyledTextCtrl_SetCurrentPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSelectionStart", (PyCFunction) _wrap_StyledTextCtrl_SetSelectionStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSelectionStart", (PyCFunction) _wrap_StyledTextCtrl_GetSelectionStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSelectionEnd", (PyCFunction) _wrap_StyledTextCtrl_SetSelectionEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSelectionEnd", (PyCFunction) _wrap_StyledTextCtrl_GetSelectionEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetPrintMagnification", (PyCFunction) _wrap_StyledTextCtrl_SetPrintMagnification, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetPrintMagnification", (PyCFunction) _wrap_StyledTextCtrl_GetPrintMagnification, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetPrintColourMode", (PyCFunction) _wrap_StyledTextCtrl_SetPrintColourMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetPrintColourMode", (PyCFunction) _wrap_StyledTextCtrl_GetPrintColourMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_FindText", (PyCFunction) _wrap_StyledTextCtrl_FindText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_FormatRange", (PyCFunction) _wrap_StyledTextCtrl_FormatRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetFirstVisibleLine", (PyCFunction) _wrap_StyledTextCtrl_GetFirstVisibleLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLine", (PyCFunction) _wrap_StyledTextCtrl_GetLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineCount", (PyCFunction) _wrap_StyledTextCtrl_GetLineCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMarginLeft", (PyCFunction) _wrap_StyledTextCtrl_SetMarginLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMarginLeft", (PyCFunction) _wrap_StyledTextCtrl_GetMarginLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMarginRight", (PyCFunction) _wrap_StyledTextCtrl_SetMarginRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMarginRight", (PyCFunction) _wrap_StyledTextCtrl_GetMarginRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetModify", (PyCFunction) _wrap_StyledTextCtrl_GetModify, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSelection", (PyCFunction) _wrap_StyledTextCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSelectedText", (PyCFunction) _wrap_StyledTextCtrl_GetSelectedText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTextRange", (PyCFunction) _wrap_StyledTextCtrl_GetTextRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HideSelection", (PyCFunction) _wrap_StyledTextCtrl_HideSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineFromPosition", (PyCFunction) _wrap_StyledTextCtrl_LineFromPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PositionFromLine", (PyCFunction) _wrap_StyledTextCtrl_PositionFromLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineScroll", (PyCFunction) _wrap_StyledTextCtrl_LineScroll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_EnsureCaretVisible", (PyCFunction) _wrap_StyledTextCtrl_EnsureCaretVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ReplaceSelection", (PyCFunction) _wrap_StyledTextCtrl_ReplaceSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetReadOnly", (PyCFunction) _wrap_StyledTextCtrl_SetReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CanPaste", (PyCFunction) _wrap_StyledTextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CanUndo", (PyCFunction) _wrap_StyledTextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_EmptyUndoBuffer", (PyCFunction) _wrap_StyledTextCtrl_EmptyUndoBuffer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Undo", (PyCFunction) _wrap_StyledTextCtrl_Undo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Cut", (PyCFunction) _wrap_StyledTextCtrl_Cut, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Copy", (PyCFunction) _wrap_StyledTextCtrl_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Paste", (PyCFunction) _wrap_StyledTextCtrl_Paste, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Clear", (PyCFunction) _wrap_StyledTextCtrl_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetText", (PyCFunction) _wrap_StyledTextCtrl_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetText", (PyCFunction) _wrap_StyledTextCtrl_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTextLength", (PyCFunction) _wrap_StyledTextCtrl_GetTextLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetOvertype", (PyCFunction) _wrap_StyledTextCtrl_SetOvertype, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetOvertype", (PyCFunction) _wrap_StyledTextCtrl_GetOvertype, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCaretWidth", (PyCFunction) _wrap_StyledTextCtrl_SetCaretWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCaretWidth", (PyCFunction) _wrap_StyledTextCtrl_GetCaretWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetTargetStart", (PyCFunction) _wrap_StyledTextCtrl_SetTargetStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTargetStart", (PyCFunction) _wrap_StyledTextCtrl_GetTargetStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetTargetEnd", (PyCFunction) _wrap_StyledTextCtrl_SetTargetEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTargetEnd", (PyCFunction) _wrap_StyledTextCtrl_GetTargetEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ReplaceTarget", (PyCFunction) _wrap_StyledTextCtrl_ReplaceTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ReplaceTargetRE", (PyCFunction) _wrap_StyledTextCtrl_ReplaceTargetRE, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SearchInTarget", (PyCFunction) _wrap_StyledTextCtrl_SearchInTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSearchFlags", (PyCFunction) _wrap_StyledTextCtrl_SetSearchFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSearchFlags", (PyCFunction) _wrap_StyledTextCtrl_GetSearchFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipShow", (PyCFunction) _wrap_StyledTextCtrl_CallTipShow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipCancel", (PyCFunction) _wrap_StyledTextCtrl_CallTipCancel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipActive", (PyCFunction) _wrap_StyledTextCtrl_CallTipActive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipPosAtStart", (PyCFunction) _wrap_StyledTextCtrl_CallTipPosAtStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipSetHighlight", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipSetBackground", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipSetForeground", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CallTipSetForegroundHighlight", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetForegroundHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_VisibleFromDocLine", (PyCFunction) _wrap_StyledTextCtrl_VisibleFromDocLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DocLineFromVisible", (PyCFunction) _wrap_StyledTextCtrl_DocLineFromVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetFoldLevel", (PyCFunction) _wrap_StyledTextCtrl_SetFoldLevel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetFoldLevel", (PyCFunction) _wrap_StyledTextCtrl_GetFoldLevel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLastChild", (PyCFunction) _wrap_StyledTextCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetFoldParent", (PyCFunction) _wrap_StyledTextCtrl_GetFoldParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ShowLines", (PyCFunction) _wrap_StyledTextCtrl_ShowLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HideLines", (PyCFunction) _wrap_StyledTextCtrl_HideLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineVisible", (PyCFunction) _wrap_StyledTextCtrl_GetLineVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetFoldExpanded", (PyCFunction) _wrap_StyledTextCtrl_SetFoldExpanded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetFoldExpanded", (PyCFunction) _wrap_StyledTextCtrl_GetFoldExpanded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ToggleFold", (PyCFunction) _wrap_StyledTextCtrl_ToggleFold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_EnsureVisible", (PyCFunction) _wrap_StyledTextCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetFoldFlags", (PyCFunction) _wrap_StyledTextCtrl_SetFoldFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_EnsureVisibleEnforcePolicy", (PyCFunction) _wrap_StyledTextCtrl_EnsureVisibleEnforcePolicy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetTabIndents", (PyCFunction) _wrap_StyledTextCtrl_SetTabIndents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTabIndents", (PyCFunction) _wrap_StyledTextCtrl_GetTabIndents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetBackSpaceUnIndents", (PyCFunction) _wrap_StyledTextCtrl_SetBackSpaceUnIndents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetBackSpaceUnIndents", (PyCFunction) _wrap_StyledTextCtrl_GetBackSpaceUnIndents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMouseDwellTime", (PyCFunction) _wrap_StyledTextCtrl_SetMouseDwellTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMouseDwellTime", (PyCFunction) _wrap_StyledTextCtrl_GetMouseDwellTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordStartPosition", (PyCFunction) _wrap_StyledTextCtrl_WordStartPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordEndPosition", (PyCFunction) _wrap_StyledTextCtrl_WordEndPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_SetWrapMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_GetWrapMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_SetLayoutCache, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_GetLayoutCache, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetScrollWidth", (PyCFunction) _wrap_StyledTextCtrl_SetScrollWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetScrollWidth", (PyCFunction) _wrap_StyledTextCtrl_GetScrollWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_TextWidth", (PyCFunction) _wrap_StyledTextCtrl_TextWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetEndAtLastLine", (PyCFunction) _wrap_StyledTextCtrl_SetEndAtLastLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetEndAtLastLine", (PyCFunction) _wrap_StyledTextCtrl_GetEndAtLastLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_TextHeight", (PyCFunction) _wrap_StyledTextCtrl_TextHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetUseVerticalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetUseVerticalScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetUseVerticalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_GetUseVerticalScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AppendText", (PyCFunction) _wrap_StyledTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetTwoPhaseDraw", (PyCFunction) _wrap_StyledTextCtrl_GetTwoPhaseDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetTwoPhaseDraw", (PyCFunction) _wrap_StyledTextCtrl_SetTwoPhaseDraw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_TargetFromSelection", (PyCFunction) _wrap_StyledTextCtrl_TargetFromSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LinesJoin", (PyCFunction) _wrap_StyledTextCtrl_LinesJoin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LinesSplit", (PyCFunction) _wrap_StyledTextCtrl_LinesSplit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetFoldMarginColour", (PyCFunction) _wrap_StyledTextCtrl_SetFoldMarginColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetFoldMarginHiColour", (PyCFunction) _wrap_StyledTextCtrl_SetFoldMarginHiColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineDown", (PyCFunction) _wrap_StyledTextCtrl_LineDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineDownExtend", (PyCFunction) _wrap_StyledTextCtrl_LineDownExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineUp", (PyCFunction) _wrap_StyledTextCtrl_LineUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineUpExtend", (PyCFunction) _wrap_StyledTextCtrl_LineUpExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CharLeft", (PyCFunction) _wrap_StyledTextCtrl_CharLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CharLeftExtend", (PyCFunction) _wrap_StyledTextCtrl_CharLeftExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CharRight", (PyCFunction) _wrap_StyledTextCtrl_CharRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CharRightExtend", (PyCFunction) _wrap_StyledTextCtrl_CharRightExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordLeft", (PyCFunction) _wrap_StyledTextCtrl_WordLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordLeftExtend", (PyCFunction) _wrap_StyledTextCtrl_WordLeftExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordRight", (PyCFunction) _wrap_StyledTextCtrl_WordRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordRightExtend", (PyCFunction) _wrap_StyledTextCtrl_WordRightExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Home", (PyCFunction) _wrap_StyledTextCtrl_Home, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HomeExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEnd", (PyCFunction) _wrap_StyledTextCtrl_LineEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEndExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DocumentStart", (PyCFunction) _wrap_StyledTextCtrl_DocumentStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DocumentStartExtend", (PyCFunction) _wrap_StyledTextCtrl_DocumentStartExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DocumentEnd", (PyCFunction) _wrap_StyledTextCtrl_DocumentEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DocumentEndExtend", (PyCFunction) _wrap_StyledTextCtrl_DocumentEndExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PageUp", (PyCFunction) _wrap_StyledTextCtrl_PageUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PageUpExtend", (PyCFunction) _wrap_StyledTextCtrl_PageUpExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PageDown", (PyCFunction) _wrap_StyledTextCtrl_PageDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PageDownExtend", (PyCFunction) _wrap_StyledTextCtrl_PageDownExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_EditToggleOvertype", (PyCFunction) _wrap_StyledTextCtrl_EditToggleOvertype, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Cancel", (PyCFunction) _wrap_StyledTextCtrl_Cancel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DeleteBack", (PyCFunction) _wrap_StyledTextCtrl_DeleteBack, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Tab", (PyCFunction) _wrap_StyledTextCtrl_Tab, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_BackTab", (PyCFunction) _wrap_StyledTextCtrl_BackTab, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_NewLine", (PyCFunction) _wrap_StyledTextCtrl_NewLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_FormFeed", (PyCFunction) _wrap_StyledTextCtrl_FormFeed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_VCHome", (PyCFunction) _wrap_StyledTextCtrl_VCHome, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_VCHomeExtend", (PyCFunction) _wrap_StyledTextCtrl_VCHomeExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ZoomIn", (PyCFunction) _wrap_StyledTextCtrl_ZoomIn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ZoomOut", (PyCFunction) _wrap_StyledTextCtrl_ZoomOut, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DelWordLeft", (PyCFunction) _wrap_StyledTextCtrl_DelWordLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DelWordRight", (PyCFunction) _wrap_StyledTextCtrl_DelWordRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineCut", (PyCFunction) _wrap_StyledTextCtrl_LineCut, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineDelete", (PyCFunction) _wrap_StyledTextCtrl_LineDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineTranspose", (PyCFunction) _wrap_StyledTextCtrl_LineTranspose, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineDuplicate", (PyCFunction) _wrap_StyledTextCtrl_LineDuplicate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LowerCase", (PyCFunction) _wrap_StyledTextCtrl_LowerCase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_UpperCase", (PyCFunction) _wrap_StyledTextCtrl_UpperCase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineScrollDown", (PyCFunction) _wrap_StyledTextCtrl_LineScrollDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineScrollUp", (PyCFunction) _wrap_StyledTextCtrl_LineScrollUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DeleteBackNotLine", (PyCFunction) _wrap_StyledTextCtrl_DeleteBackNotLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HomeDisplay", (PyCFunction) _wrap_StyledTextCtrl_HomeDisplay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HomeDisplayExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeDisplayExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEndDisplay", (PyCFunction) _wrap_StyledTextCtrl_LineEndDisplay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEndDisplayExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndDisplayExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HomeWrap", (PyCFunction) _wrap_StyledTextCtrl_HomeWrap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HomeWrapExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeWrapExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEndWrap", (PyCFunction) _wrap_StyledTextCtrl_LineEndWrap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEndWrapExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndWrapExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_VCHomeWrap", (PyCFunction) _wrap_StyledTextCtrl_VCHomeWrap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_VCHomeWrapExtend", (PyCFunction) _wrap_StyledTextCtrl_VCHomeWrapExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineCopy", (PyCFunction) _wrap_StyledTextCtrl_LineCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_MoveCaretInsideView", (PyCFunction) _wrap_StyledTextCtrl_MoveCaretInsideView, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineLength", (PyCFunction) _wrap_StyledTextCtrl_LineLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_StyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_BraceBadLight", (PyCFunction) _wrap_StyledTextCtrl_BraceBadLight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_BraceMatch", (PyCFunction) _wrap_StyledTextCtrl_BraceMatch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetViewEOL", (PyCFunction) _wrap_StyledTextCtrl_GetViewEOL, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetViewEOL", (PyCFunction) _wrap_StyledTextCtrl_SetViewEOL, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetDocPointer", (PyCFunction) _wrap_StyledTextCtrl_GetDocPointer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetDocPointer", (PyCFunction) _wrap_StyledTextCtrl_SetDocPointer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetModEventMask", (PyCFunction) _wrap_StyledTextCtrl_SetModEventMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetEdgeColumn", (PyCFunction) _wrap_StyledTextCtrl_GetEdgeColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetEdgeColumn", (PyCFunction) _wrap_StyledTextCtrl_SetEdgeColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetEdgeMode", (PyCFunction) _wrap_StyledTextCtrl_GetEdgeMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetEdgeMode", (PyCFunction) _wrap_StyledTextCtrl_SetEdgeMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetEdgeColour", (PyCFunction) _wrap_StyledTextCtrl_GetEdgeColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetEdgeColour", (PyCFunction) _wrap_StyledTextCtrl_SetEdgeColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SearchAnchor", (PyCFunction) _wrap_StyledTextCtrl_SearchAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SearchNext", (PyCFunction) _wrap_StyledTextCtrl_SearchNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SearchPrev", (PyCFunction) _wrap_StyledTextCtrl_SearchPrev, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LinesOnScreen", (PyCFunction) _wrap_StyledTextCtrl_LinesOnScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_UsePopUp", (PyCFunction) _wrap_StyledTextCtrl_UsePopUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SelectionIsRectangle", (PyCFunction) _wrap_StyledTextCtrl_SelectionIsRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetZoom", (PyCFunction) _wrap_StyledTextCtrl_SetZoom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetZoom", (PyCFunction) _wrap_StyledTextCtrl_GetZoom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CreateDocument", (PyCFunction) _wrap_StyledTextCtrl_CreateDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AddRefDocument", (PyCFunction) _wrap_StyledTextCtrl_AddRefDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ReleaseDocument", (PyCFunction) _wrap_StyledTextCtrl_ReleaseDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetModEventMask", (PyCFunction) _wrap_StyledTextCtrl_GetModEventMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSTCFocus", (PyCFunction) _wrap_StyledTextCtrl_SetSTCFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSTCFocus", (PyCFunction) _wrap_StyledTextCtrl_GetSTCFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetStatus", (PyCFunction) _wrap_StyledTextCtrl_SetStatus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetStatus", (PyCFunction) _wrap_StyledTextCtrl_GetStatus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMouseDownCaptures", (PyCFunction) _wrap_StyledTextCtrl_SetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetMouseDownCaptures", (PyCFunction) _wrap_StyledTextCtrl_GetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSTCCursor", (PyCFunction) _wrap_StyledTextCtrl_SetSTCCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSTCCursor", (PyCFunction) _wrap_StyledTextCtrl_GetSTCCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetControlCharSymbol", (PyCFunction) _wrap_StyledTextCtrl_SetControlCharSymbol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetControlCharSymbol", (PyCFunction) _wrap_StyledTextCtrl_GetControlCharSymbol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordPartLeft", (PyCFunction) _wrap_StyledTextCtrl_WordPartLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordPartLeftExtend", (PyCFunction) _wrap_StyledTextCtrl_WordPartLeftExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordPartRight", (PyCFunction) _wrap_StyledTextCtrl_WordPartRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordPartRightExtend", (PyCFunction) _wrap_StyledTextCtrl_WordPartRightExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetVisiblePolicy", (PyCFunction) _wrap_StyledTextCtrl_SetVisiblePolicy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DelLineLeft", (PyCFunction) _wrap_StyledTextCtrl_DelLineLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DelLineRight", (PyCFunction) _wrap_StyledTextCtrl_DelLineRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetXOffset", (PyCFunction) _wrap_StyledTextCtrl_SetXOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetXOffset", (PyCFunction) _wrap_StyledTextCtrl_GetXOffset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ChooseCaretX", (PyCFunction) _wrap_StyledTextCtrl_ChooseCaretX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetXCaretPolicy", (PyCFunction) _wrap_StyledTextCtrl_SetXCaretPolicy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetYCaretPolicy", (PyCFunction) _wrap_StyledTextCtrl_SetYCaretPolicy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetPrintWrapMode", (PyCFunction) _wrap_StyledTextCtrl_SetPrintWrapMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetPrintWrapMode", (PyCFunction) _wrap_StyledTextCtrl_GetPrintWrapMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetHotspotActiveForeground", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotActiveForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetHotspotActiveBackground", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotActiveBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetHotspotActiveUnderline", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotActiveUnderline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetHotspotSingleLine", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotSingleLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ParaDown", (PyCFunction) _wrap_StyledTextCtrl_ParaDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ParaDownExtend", (PyCFunction) _wrap_StyledTextCtrl_ParaDownExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ParaUp", (PyCFunction) _wrap_StyledTextCtrl_ParaUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ParaUpExtend", (PyCFunction) _wrap_StyledTextCtrl_ParaUpExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PositionBefore", (PyCFunction) _wrap_StyledTextCtrl_PositionBefore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PositionAfter", (PyCFunction) _wrap_StyledTextCtrl_PositionAfter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CopyRange", (PyCFunction) _wrap_StyledTextCtrl_CopyRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CopyText", (PyCFunction) _wrap_StyledTextCtrl_CopyText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetSelectionMode", (PyCFunction) _wrap_StyledTextCtrl_SetSelectionMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSelectionMode", (PyCFunction) _wrap_StyledTextCtrl_GetSelectionMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineSelStartPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineSelStartPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLineSelEndPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineSelEndPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineDownRectExtend", (PyCFunction) _wrap_StyledTextCtrl_LineDownRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineUpRectExtend", (PyCFunction) _wrap_StyledTextCtrl_LineUpRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CharLeftRectExtend", (PyCFunction) _wrap_StyledTextCtrl_CharLeftRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CharRightRectExtend", (PyCFunction) _wrap_StyledTextCtrl_CharRightRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_HomeRectExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_VCHomeRectExtend", (PyCFunction) _wrap_StyledTextCtrl_VCHomeRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LineEndRectExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PageUpRectExtend", (PyCFunction) _wrap_StyledTextCtrl_PageUpRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PageDownRectExtend", (PyCFunction) _wrap_StyledTextCtrl_PageDownRectExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StutteredPageUp", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StutteredPageUpExtend", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageUpExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StutteredPageDown", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StutteredPageDownExtend", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageDownExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordLeftEnd", (PyCFunction) _wrap_StyledTextCtrl_WordLeftEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordLeftEndExtend", (PyCFunction) _wrap_StyledTextCtrl_WordLeftEndExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordRightEnd", (PyCFunction) _wrap_StyledTextCtrl_WordRightEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_WordRightEndExtend", (PyCFunction) _wrap_StyledTextCtrl_WordRightEndExtend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetWhitespaceChars", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceChars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLexer", (PyCFunction) _wrap_StyledTextCtrl_GetLexer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_Colourise", (PyCFunction) _wrap_StyledTextCtrl_Colourise, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetProperty", (PyCFunction) _wrap_StyledTextCtrl_SetProperty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetKeyWords", (PyCFunction) _wrap_StyledTextCtrl_SetKeyWords, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetLexerLanguage", (PyCFunction) _wrap_StyledTextCtrl_SetLexerLanguage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetCurrentLine", (PyCFunction) _wrap_StyledTextCtrl_GetCurrentLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetSpec", (PyCFunction) _wrap_StyledTextCtrl_StyleSetSpec, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetFont", (PyCFunction) _wrap_StyledTextCtrl_StyleSetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_StyleSetFontAttr", (PyCFunction) _wrap_StyledTextCtrl_StyleSetFontAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_CmdKeyExecute", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyExecute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetMargins", (PyCFunction) _wrap_StyledTextCtrl_SetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetSelection", (PyCFunction) _wrap_StyledTextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_PointFromPosition", (PyCFunction) _wrap_StyledTextCtrl_PointFromPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ScrollToLine", (PyCFunction) _wrap_StyledTextCtrl_ScrollToLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_ScrollToColumn", (PyCFunction) _wrap_StyledTextCtrl_ScrollToColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SendMsg", (PyCFunction) _wrap_StyledTextCtrl_SendMsg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetVScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetVScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetHScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetHScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetLastKeydownProcessed", (PyCFunction) _wrap_StyledTextCtrl_GetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetLastKeydownProcessed", (PyCFunction) _wrap_StyledTextCtrl_SetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SaveFile", (PyCFunction) _wrap_StyledTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_LoadFile", (PyCFunction) _wrap_StyledTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DoDragOver", (PyCFunction) _wrap_StyledTextCtrl_DoDragOver, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetPosition", (PyCFunction) _wrap_StyledTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetKey", (PyCFunction) _wrap_StyledTextEvent_SetKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetModifiers", (PyCFunction) _wrap_StyledTextEvent_SetModifiers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetModificationType", (PyCFunction) _wrap_StyledTextEvent_SetModificationType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetText", (PyCFunction) _wrap_StyledTextEvent_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetLength", (PyCFunction) _wrap_StyledTextEvent_SetLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetLinesAdded", (PyCFunction) _wrap_StyledTextEvent_SetLinesAdded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetLine", (PyCFunction) _wrap_StyledTextEvent_SetLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetFoldLevelNow", (PyCFunction) _wrap_StyledTextEvent_SetFoldLevelNow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetFoldLevelPrev", (PyCFunction) _wrap_StyledTextEvent_SetFoldLevelPrev, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetMargin", (PyCFunction) _wrap_StyledTextEvent_SetMargin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetMessage", (PyCFunction) _wrap_StyledTextEvent_SetMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetWParam", (PyCFunction) _wrap_StyledTextEvent_SetWParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetLParam", (PyCFunction) _wrap_StyledTextEvent_SetLParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetListType", (PyCFunction) _wrap_StyledTextEvent_SetListType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetX", (PyCFunction) _wrap_StyledTextEvent_SetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetY", (PyCFunction) _wrap_StyledTextEvent_SetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetDragText", (PyCFunction) _wrap_StyledTextEvent_SetDragText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetDragAllowMove", (PyCFunction) _wrap_StyledTextEvent_SetDragAllowMove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_SetDragResult", (PyCFunction) _wrap_StyledTextEvent_SetDragResult, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetPosition", (PyCFunction) _wrap_StyledTextEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetKey", (PyCFunction) _wrap_StyledTextEvent_GetKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetModifiers", (PyCFunction) _wrap_StyledTextEvent_GetModifiers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetModificationType", (PyCFunction) _wrap_StyledTextEvent_GetModificationType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetText", (PyCFunction) _wrap_StyledTextEvent_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetLength", (PyCFunction) _wrap_StyledTextEvent_GetLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetLinesAdded", (PyCFunction) _wrap_StyledTextEvent_GetLinesAdded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetLine", (PyCFunction) _wrap_StyledTextEvent_GetLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetFoldLevelNow", (PyCFunction) _wrap_StyledTextEvent_GetFoldLevelNow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetFoldLevelPrev", (PyCFunction) _wrap_StyledTextEvent_GetFoldLevelPrev, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetMargin", (PyCFunction) _wrap_StyledTextEvent_GetMargin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetMessage", (PyCFunction) _wrap_StyledTextEvent_GetMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetWParam", (PyCFunction) _wrap_StyledTextEvent_GetWParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetLParam", (PyCFunction) _wrap_StyledTextEvent_GetLParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetListType", (PyCFunction) _wrap_StyledTextEvent_GetListType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetX", (PyCFunction) _wrap_StyledTextEvent_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetY", (PyCFunction) _wrap_StyledTextEvent_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetDragText", (PyCFunction) _wrap_StyledTextEvent_GetDragText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetDragAllowMove", (PyCFunction) _wrap_StyledTextEvent_GetDragAllowMove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetDragResult", (PyCFunction) _wrap_StyledTextEvent_GetDragResult, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetShift", (PyCFunction) _wrap_StyledTextEvent_GetShift, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetControl", (PyCFunction) _wrap_StyledTextEvent_GetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_GetAlt", (PyCFunction) _wrap_StyledTextEvent_GetAlt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_Clone", (PyCFunction) _wrap_StyledTextEvent_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StyledTextEvent_swigregister", StyledTextEvent_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_StyledTextCtrl", (PyCFunction) _wrap_new_StyledTextCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreStyledTextCtrl", (PyCFunction) _wrap_new_PreStyledTextCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Create", (PyCFunction) _wrap_StyledTextCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AddText", (PyCFunction) _wrap_StyledTextCtrl_AddText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AddStyledText", (PyCFunction) _wrap_StyledTextCtrl_AddStyledText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_InsertText", (PyCFunction) _wrap_StyledTextCtrl_InsertText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ClearAll", (PyCFunction) _wrap_StyledTextCtrl_ClearAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ClearDocumentStyle", (PyCFunction) _wrap_StyledTextCtrl_ClearDocumentStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLength", (PyCFunction) _wrap_StyledTextCtrl_GetLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCharAt", (PyCFunction) _wrap_StyledTextCtrl_GetCharAt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCurrentPos", (PyCFunction) _wrap_StyledTextCtrl_GetCurrentPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetAnchor", (PyCFunction) _wrap_StyledTextCtrl_GetAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetStyleAt", (PyCFunction) _wrap_StyledTextCtrl_GetStyleAt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Redo", (PyCFunction) _wrap_StyledTextCtrl_Redo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetUndoCollection", (PyCFunction) _wrap_StyledTextCtrl_SetUndoCollection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SelectAll", (PyCFunction) _wrap_StyledTextCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSavePoint", (PyCFunction) _wrap_StyledTextCtrl_SetSavePoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetStyledText", (PyCFunction) _wrap_StyledTextCtrl_GetStyledText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CanRedo", (PyCFunction) _wrap_StyledTextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerLineFromHandle", (PyCFunction) _wrap_StyledTextCtrl_MarkerLineFromHandle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerDeleteHandle", (PyCFunction) _wrap_StyledTextCtrl_MarkerDeleteHandle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetUndoCollection", (PyCFunction) _wrap_StyledTextCtrl_GetUndoCollection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetViewWhiteSpace", (PyCFunction) _wrap_StyledTextCtrl_GetViewWhiteSpace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetViewWhiteSpace", (PyCFunction) _wrap_StyledTextCtrl_SetViewWhiteSpace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PositionFromPoint", (PyCFunction) _wrap_StyledTextCtrl_PositionFromPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PositionFromPointClose", (PyCFunction) _wrap_StyledTextCtrl_PositionFromPointClose, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GotoLine", (PyCFunction) _wrap_StyledTextCtrl_GotoLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GotoPos", (PyCFunction) _wrap_StyledTextCtrl_GotoPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetAnchor", (PyCFunction) _wrap_StyledTextCtrl_SetAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCurLine", (PyCFunction) _wrap_StyledTextCtrl_GetCurLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetEndStyled", (PyCFunction) _wrap_StyledTextCtrl_GetEndStyled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ConvertEOLs", (PyCFunction) _wrap_StyledTextCtrl_ConvertEOLs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetEOLMode", (PyCFunction) _wrap_StyledTextCtrl_GetEOLMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetEOLMode", (PyCFunction) _wrap_StyledTextCtrl_SetEOLMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StartStyling", (PyCFunction) _wrap_StyledTextCtrl_StartStyling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetStyling", (PyCFunction) _wrap_StyledTextCtrl_SetStyling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetBufferedDraw", (PyCFunction) _wrap_StyledTextCtrl_GetBufferedDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetBufferedDraw", (PyCFunction) _wrap_StyledTextCtrl_SetBufferedDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetTabWidth", (PyCFunction) _wrap_StyledTextCtrl_SetTabWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTabWidth", (PyCFunction) _wrap_StyledTextCtrl_GetTabWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCodePage", (PyCFunction) _wrap_StyledTextCtrl_SetCodePage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerDefine", (PyCFunction) _wrap_StyledTextCtrl_MarkerDefine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerSetForeground", (PyCFunction) _wrap_StyledTextCtrl_MarkerSetForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerSetBackground", (PyCFunction) _wrap_StyledTextCtrl_MarkerSetBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerAdd", (PyCFunction) _wrap_StyledTextCtrl_MarkerAdd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerDelete", (PyCFunction) _wrap_StyledTextCtrl_MarkerDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerDeleteAll", (PyCFunction) _wrap_StyledTextCtrl_MarkerDeleteAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerGet", (PyCFunction) _wrap_StyledTextCtrl_MarkerGet, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerNext", (PyCFunction) _wrap_StyledTextCtrl_MarkerNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerPrevious", (PyCFunction) _wrap_StyledTextCtrl_MarkerPrevious, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MarkerDefineBitmap", (PyCFunction) _wrap_StyledTextCtrl_MarkerDefineBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMarginType", (PyCFunction) _wrap_StyledTextCtrl_SetMarginType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMarginType", (PyCFunction) _wrap_StyledTextCtrl_GetMarginType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMarginWidth", (PyCFunction) _wrap_StyledTextCtrl_SetMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMarginWidth", (PyCFunction) _wrap_StyledTextCtrl_GetMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMarginMask", (PyCFunction) _wrap_StyledTextCtrl_SetMarginMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMarginMask", (PyCFunction) _wrap_StyledTextCtrl_GetMarginMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMarginSensitive", (PyCFunction) _wrap_StyledTextCtrl_SetMarginSensitive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMarginSensitive", (PyCFunction) _wrap_StyledTextCtrl_GetMarginSensitive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleClearAll", (PyCFunction) _wrap_StyledTextCtrl_StyleClearAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetForeground", (PyCFunction) _wrap_StyledTextCtrl_StyleSetForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetBackground", (PyCFunction) _wrap_StyledTextCtrl_StyleSetBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetBold", (PyCFunction) _wrap_StyledTextCtrl_StyleSetBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetItalic", (PyCFunction) _wrap_StyledTextCtrl_StyleSetItalic, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetSize", (PyCFunction) _wrap_StyledTextCtrl_StyleSetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetFaceName", (PyCFunction) _wrap_StyledTextCtrl_StyleSetFaceName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetEOLFilled", (PyCFunction) _wrap_StyledTextCtrl_StyleSetEOLFilled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleResetDefault", (PyCFunction) _wrap_StyledTextCtrl_StyleResetDefault, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetUnderline", (PyCFunction) _wrap_StyledTextCtrl_StyleSetUnderline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetCase", (PyCFunction) _wrap_StyledTextCtrl_StyleSetCase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetCharacterSet", (PyCFunction) _wrap_StyledTextCtrl_StyleSetCharacterSet, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetHotSpot", (PyCFunction) _wrap_StyledTextCtrl_StyleSetHotSpot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSelForeground", (PyCFunction) _wrap_StyledTextCtrl_SetSelForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSelBackground", (PyCFunction) _wrap_StyledTextCtrl_SetSelBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCaretForeground", (PyCFunction) _wrap_StyledTextCtrl_SetCaretForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CmdKeyAssign", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyAssign, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CmdKeyClear", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyClear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CmdKeyClearAll", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyClearAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetStyleBytes", (PyCFunction) _wrap_StyledTextCtrl_SetStyleBytes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetVisible", (PyCFunction) _wrap_StyledTextCtrl_StyleSetVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCaretPeriod", (PyCFunction) _wrap_StyledTextCtrl_GetCaretPeriod, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCaretPeriod", (PyCFunction) _wrap_StyledTextCtrl_SetCaretPeriod, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetWordChars", (PyCFunction) _wrap_StyledTextCtrl_SetWordChars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_BeginUndoAction", (PyCFunction) _wrap_StyledTextCtrl_BeginUndoAction, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_EndUndoAction", (PyCFunction) _wrap_StyledTextCtrl_EndUndoAction, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_IndicatorSetStyle", (PyCFunction) _wrap_StyledTextCtrl_IndicatorSetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_IndicatorGetStyle", (PyCFunction) _wrap_StyledTextCtrl_IndicatorGetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_IndicatorSetForeground", (PyCFunction) _wrap_StyledTextCtrl_IndicatorSetForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_IndicatorGetForeground", (PyCFunction) _wrap_StyledTextCtrl_IndicatorGetForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetWhitespaceForeground", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetWhitespaceBackground", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetStyleBits", (PyCFunction) _wrap_StyledTextCtrl_SetStyleBits, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetStyleBits", (PyCFunction) _wrap_StyledTextCtrl_GetStyleBits, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetLineState", (PyCFunction) _wrap_StyledTextCtrl_SetLineState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineState", (PyCFunction) _wrap_StyledTextCtrl_GetLineState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMaxLineState", (PyCFunction) _wrap_StyledTextCtrl_GetMaxLineState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCaretLineVisible", (PyCFunction) _wrap_StyledTextCtrl_GetCaretLineVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCaretLineVisible", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCaretLineBack", (PyCFunction) _wrap_StyledTextCtrl_GetCaretLineBack, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCaretLineBack", (PyCFunction) _wrap_StyledTextCtrl_SetCaretLineBack, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetChangeable", (PyCFunction) _wrap_StyledTextCtrl_StyleSetChangeable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompShow", (PyCFunction) _wrap_StyledTextCtrl_AutoCompShow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompCancel", (PyCFunction) _wrap_StyledTextCtrl_AutoCompCancel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompActive", (PyCFunction) _wrap_StyledTextCtrl_AutoCompActive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompPosStart", (PyCFunction) _wrap_StyledTextCtrl_AutoCompPosStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompComplete", (PyCFunction) _wrap_StyledTextCtrl_AutoCompComplete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompStops", (PyCFunction) _wrap_StyledTextCtrl_AutoCompStops, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSelect", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSelect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetCancelAtStart", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetCancelAtStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetCancelAtStart", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCancelAtStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetFillUps", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetFillUps, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetChooseSingle", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetChooseSingle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetChooseSingle", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetChooseSingle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetIgnoreCase", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetIgnoreCase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetIgnoreCase", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetIgnoreCase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_UserListShow", (PyCFunction) _wrap_StyledTextCtrl_UserListShow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetAutoHide", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetAutoHide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetAutoHide", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetAutoHide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetDropRestOfWord", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetDropRestOfWord, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetDropRestOfWord", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetDropRestOfWord, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_RegisterImage", (PyCFunction) _wrap_StyledTextCtrl_RegisterImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ClearRegisteredImages", (PyCFunction) _wrap_StyledTextCtrl_ClearRegisteredImages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetTypeSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetTypeSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompSetTypeSeparator", (PyCFunction) _wrap_StyledTextCtrl_AutoCompSetTypeSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetIndent", (PyCFunction) _wrap_StyledTextCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetIndent", (PyCFunction) _wrap_StyledTextCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetUseTabs", (PyCFunction) _wrap_StyledTextCtrl_SetUseTabs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetUseTabs", (PyCFunction) _wrap_StyledTextCtrl_GetUseTabs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetLineIndentation", (PyCFunction) _wrap_StyledTextCtrl_SetLineIndentation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineIndentation", (PyCFunction) _wrap_StyledTextCtrl_GetLineIndentation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineIndentPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineIndentPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetColumn", (PyCFunction) _wrap_StyledTextCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetUseHorizontalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetUseHorizontalScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetUseHorizontalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_GetUseHorizontalScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetIndentationGuides", (PyCFunction) _wrap_StyledTextCtrl_SetIndentationGuides, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetIndentationGuides", (PyCFunction) _wrap_StyledTextCtrl_GetIndentationGuides, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetHighlightGuide", (PyCFunction) _wrap_StyledTextCtrl_SetHighlightGuide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetHighlightGuide", (PyCFunction) _wrap_StyledTextCtrl_GetHighlightGuide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineEndPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineEndPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCodePage", (PyCFunction) _wrap_StyledTextCtrl_GetCodePage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCaretForeground", (PyCFunction) _wrap_StyledTextCtrl_GetCaretForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetReadOnly", (PyCFunction) _wrap_StyledTextCtrl_GetReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCurrentPos", (PyCFunction) _wrap_StyledTextCtrl_SetCurrentPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSelectionStart", (PyCFunction) _wrap_StyledTextCtrl_SetSelectionStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSelectionStart", (PyCFunction) _wrap_StyledTextCtrl_GetSelectionStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSelectionEnd", (PyCFunction) _wrap_StyledTextCtrl_SetSelectionEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSelectionEnd", (PyCFunction) _wrap_StyledTextCtrl_GetSelectionEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetPrintMagnification", (PyCFunction) _wrap_StyledTextCtrl_SetPrintMagnification, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetPrintMagnification", (PyCFunction) _wrap_StyledTextCtrl_GetPrintMagnification, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetPrintColourMode", (PyCFunction) _wrap_StyledTextCtrl_SetPrintColourMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetPrintColourMode", (PyCFunction) _wrap_StyledTextCtrl_GetPrintColourMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_FindText", (PyCFunction) _wrap_StyledTextCtrl_FindText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_FormatRange", (PyCFunction) _wrap_StyledTextCtrl_FormatRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetFirstVisibleLine", (PyCFunction) _wrap_StyledTextCtrl_GetFirstVisibleLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLine", (PyCFunction) _wrap_StyledTextCtrl_GetLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineCount", (PyCFunction) _wrap_StyledTextCtrl_GetLineCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMarginLeft", (PyCFunction) _wrap_StyledTextCtrl_SetMarginLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMarginLeft", (PyCFunction) _wrap_StyledTextCtrl_GetMarginLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMarginRight", (PyCFunction) _wrap_StyledTextCtrl_SetMarginRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMarginRight", (PyCFunction) _wrap_StyledTextCtrl_GetMarginRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetModify", (PyCFunction) _wrap_StyledTextCtrl_GetModify, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSelection", (PyCFunction) _wrap_StyledTextCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSelectedText", (PyCFunction) _wrap_StyledTextCtrl_GetSelectedText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTextRange", (PyCFunction) _wrap_StyledTextCtrl_GetTextRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HideSelection", (PyCFunction) _wrap_StyledTextCtrl_HideSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineFromPosition", (PyCFunction) _wrap_StyledTextCtrl_LineFromPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PositionFromLine", (PyCFunction) _wrap_StyledTextCtrl_PositionFromLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineScroll", (PyCFunction) _wrap_StyledTextCtrl_LineScroll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_EnsureCaretVisible", (PyCFunction) _wrap_StyledTextCtrl_EnsureCaretVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ReplaceSelection", (PyCFunction) _wrap_StyledTextCtrl_ReplaceSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetReadOnly", (PyCFunction) _wrap_StyledTextCtrl_SetReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CanPaste", (PyCFunction) _wrap_StyledTextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CanUndo", (PyCFunction) _wrap_StyledTextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_EmptyUndoBuffer", (PyCFunction) _wrap_StyledTextCtrl_EmptyUndoBuffer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Undo", (PyCFunction) _wrap_StyledTextCtrl_Undo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Cut", (PyCFunction) _wrap_StyledTextCtrl_Cut, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Copy", (PyCFunction) _wrap_StyledTextCtrl_Copy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Paste", (PyCFunction) _wrap_StyledTextCtrl_Paste, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Clear", (PyCFunction) _wrap_StyledTextCtrl_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetText", (PyCFunction) _wrap_StyledTextCtrl_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetText", (PyCFunction) _wrap_StyledTextCtrl_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTextLength", (PyCFunction) _wrap_StyledTextCtrl_GetTextLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetOvertype", (PyCFunction) _wrap_StyledTextCtrl_SetOvertype, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetOvertype", (PyCFunction) _wrap_StyledTextCtrl_GetOvertype, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCaretWidth", (PyCFunction) _wrap_StyledTextCtrl_SetCaretWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCaretWidth", (PyCFunction) _wrap_StyledTextCtrl_GetCaretWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetTargetStart", (PyCFunction) _wrap_StyledTextCtrl_SetTargetStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTargetStart", (PyCFunction) _wrap_StyledTextCtrl_GetTargetStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetTargetEnd", (PyCFunction) _wrap_StyledTextCtrl_SetTargetEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTargetEnd", (PyCFunction) _wrap_StyledTextCtrl_GetTargetEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ReplaceTarget", (PyCFunction) _wrap_StyledTextCtrl_ReplaceTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ReplaceTargetRE", (PyCFunction) _wrap_StyledTextCtrl_ReplaceTargetRE, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SearchInTarget", (PyCFunction) _wrap_StyledTextCtrl_SearchInTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSearchFlags", (PyCFunction) _wrap_StyledTextCtrl_SetSearchFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSearchFlags", (PyCFunction) _wrap_StyledTextCtrl_GetSearchFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipShow", (PyCFunction) _wrap_StyledTextCtrl_CallTipShow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipCancel", (PyCFunction) _wrap_StyledTextCtrl_CallTipCancel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipActive", (PyCFunction) _wrap_StyledTextCtrl_CallTipActive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipPosAtStart", (PyCFunction) _wrap_StyledTextCtrl_CallTipPosAtStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipSetHighlight", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipSetBackground", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipSetForeground", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CallTipSetForegroundHighlight", (PyCFunction) _wrap_StyledTextCtrl_CallTipSetForegroundHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_VisibleFromDocLine", (PyCFunction) _wrap_StyledTextCtrl_VisibleFromDocLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DocLineFromVisible", (PyCFunction) _wrap_StyledTextCtrl_DocLineFromVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetFoldLevel", (PyCFunction) _wrap_StyledTextCtrl_SetFoldLevel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetFoldLevel", (PyCFunction) _wrap_StyledTextCtrl_GetFoldLevel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLastChild", (PyCFunction) _wrap_StyledTextCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetFoldParent", (PyCFunction) _wrap_StyledTextCtrl_GetFoldParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ShowLines", (PyCFunction) _wrap_StyledTextCtrl_ShowLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HideLines", (PyCFunction) _wrap_StyledTextCtrl_HideLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineVisible", (PyCFunction) _wrap_StyledTextCtrl_GetLineVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetFoldExpanded", (PyCFunction) _wrap_StyledTextCtrl_SetFoldExpanded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetFoldExpanded", (PyCFunction) _wrap_StyledTextCtrl_GetFoldExpanded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ToggleFold", (PyCFunction) _wrap_StyledTextCtrl_ToggleFold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_EnsureVisible", (PyCFunction) _wrap_StyledTextCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetFoldFlags", (PyCFunction) _wrap_StyledTextCtrl_SetFoldFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_EnsureVisibleEnforcePolicy", (PyCFunction) _wrap_StyledTextCtrl_EnsureVisibleEnforcePolicy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetTabIndents", (PyCFunction) _wrap_StyledTextCtrl_SetTabIndents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTabIndents", (PyCFunction) _wrap_StyledTextCtrl_GetTabIndents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetBackSpaceUnIndents", (PyCFunction) _wrap_StyledTextCtrl_SetBackSpaceUnIndents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetBackSpaceUnIndents", (PyCFunction) _wrap_StyledTextCtrl_GetBackSpaceUnIndents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMouseDwellTime", (PyCFunction) _wrap_StyledTextCtrl_SetMouseDwellTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMouseDwellTime", (PyCFunction) _wrap_StyledTextCtrl_GetMouseDwellTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordStartPosition", (PyCFunction) _wrap_StyledTextCtrl_WordStartPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordEndPosition", (PyCFunction) _wrap_StyledTextCtrl_WordEndPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_SetWrapMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetWrapMode", (PyCFunction) _wrap_StyledTextCtrl_GetWrapMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_SetLayoutCache, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLayoutCache", (PyCFunction) _wrap_StyledTextCtrl_GetLayoutCache, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetScrollWidth", (PyCFunction) _wrap_StyledTextCtrl_SetScrollWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetScrollWidth", (PyCFunction) _wrap_StyledTextCtrl_GetScrollWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_TextWidth", (PyCFunction) _wrap_StyledTextCtrl_TextWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetEndAtLastLine", (PyCFunction) _wrap_StyledTextCtrl_SetEndAtLastLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetEndAtLastLine", (PyCFunction) _wrap_StyledTextCtrl_GetEndAtLastLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_TextHeight", (PyCFunction) _wrap_StyledTextCtrl_TextHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetUseVerticalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetUseVerticalScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetUseVerticalScrollBar", (PyCFunction) _wrap_StyledTextCtrl_GetUseVerticalScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AppendText", (PyCFunction) _wrap_StyledTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetTwoPhaseDraw", (PyCFunction) _wrap_StyledTextCtrl_GetTwoPhaseDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetTwoPhaseDraw", (PyCFunction) _wrap_StyledTextCtrl_SetTwoPhaseDraw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_TargetFromSelection", (PyCFunction) _wrap_StyledTextCtrl_TargetFromSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LinesJoin", (PyCFunction) _wrap_StyledTextCtrl_LinesJoin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LinesSplit", (PyCFunction) _wrap_StyledTextCtrl_LinesSplit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetFoldMarginColour", (PyCFunction) _wrap_StyledTextCtrl_SetFoldMarginColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetFoldMarginHiColour", (PyCFunction) _wrap_StyledTextCtrl_SetFoldMarginHiColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineDown", (PyCFunction) _wrap_StyledTextCtrl_LineDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineDownExtend", (PyCFunction) _wrap_StyledTextCtrl_LineDownExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineUp", (PyCFunction) _wrap_StyledTextCtrl_LineUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineUpExtend", (PyCFunction) _wrap_StyledTextCtrl_LineUpExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CharLeft", (PyCFunction) _wrap_StyledTextCtrl_CharLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CharLeftExtend", (PyCFunction) _wrap_StyledTextCtrl_CharLeftExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CharRight", (PyCFunction) _wrap_StyledTextCtrl_CharRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CharRightExtend", (PyCFunction) _wrap_StyledTextCtrl_CharRightExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordLeft", (PyCFunction) _wrap_StyledTextCtrl_WordLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordLeftExtend", (PyCFunction) _wrap_StyledTextCtrl_WordLeftExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordRight", (PyCFunction) _wrap_StyledTextCtrl_WordRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordRightExtend", (PyCFunction) _wrap_StyledTextCtrl_WordRightExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Home", (PyCFunction) _wrap_StyledTextCtrl_Home, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HomeExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEnd", (PyCFunction) _wrap_StyledTextCtrl_LineEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEndExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DocumentStart", (PyCFunction) _wrap_StyledTextCtrl_DocumentStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DocumentStartExtend", (PyCFunction) _wrap_StyledTextCtrl_DocumentStartExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DocumentEnd", (PyCFunction) _wrap_StyledTextCtrl_DocumentEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DocumentEndExtend", (PyCFunction) _wrap_StyledTextCtrl_DocumentEndExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PageUp", (PyCFunction) _wrap_StyledTextCtrl_PageUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PageUpExtend", (PyCFunction) _wrap_StyledTextCtrl_PageUpExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PageDown", (PyCFunction) _wrap_StyledTextCtrl_PageDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PageDownExtend", (PyCFunction) _wrap_StyledTextCtrl_PageDownExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_EditToggleOvertype", (PyCFunction) _wrap_StyledTextCtrl_EditToggleOvertype, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Cancel", (PyCFunction) _wrap_StyledTextCtrl_Cancel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DeleteBack", (PyCFunction) _wrap_StyledTextCtrl_DeleteBack, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Tab", (PyCFunction) _wrap_StyledTextCtrl_Tab, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_BackTab", (PyCFunction) _wrap_StyledTextCtrl_BackTab, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_NewLine", (PyCFunction) _wrap_StyledTextCtrl_NewLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_FormFeed", (PyCFunction) _wrap_StyledTextCtrl_FormFeed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_VCHome", (PyCFunction) _wrap_StyledTextCtrl_VCHome, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_VCHomeExtend", (PyCFunction) _wrap_StyledTextCtrl_VCHomeExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ZoomIn", (PyCFunction) _wrap_StyledTextCtrl_ZoomIn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ZoomOut", (PyCFunction) _wrap_StyledTextCtrl_ZoomOut, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DelWordLeft", (PyCFunction) _wrap_StyledTextCtrl_DelWordLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DelWordRight", (PyCFunction) _wrap_StyledTextCtrl_DelWordRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineCut", (PyCFunction) _wrap_StyledTextCtrl_LineCut, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineDelete", (PyCFunction) _wrap_StyledTextCtrl_LineDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineTranspose", (PyCFunction) _wrap_StyledTextCtrl_LineTranspose, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineDuplicate", (PyCFunction) _wrap_StyledTextCtrl_LineDuplicate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LowerCase", (PyCFunction) _wrap_StyledTextCtrl_LowerCase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_UpperCase", (PyCFunction) _wrap_StyledTextCtrl_UpperCase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineScrollDown", (PyCFunction) _wrap_StyledTextCtrl_LineScrollDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineScrollUp", (PyCFunction) _wrap_StyledTextCtrl_LineScrollUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DeleteBackNotLine", (PyCFunction) _wrap_StyledTextCtrl_DeleteBackNotLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HomeDisplay", (PyCFunction) _wrap_StyledTextCtrl_HomeDisplay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HomeDisplayExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeDisplayExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEndDisplay", (PyCFunction) _wrap_StyledTextCtrl_LineEndDisplay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEndDisplayExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndDisplayExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HomeWrap", (PyCFunction) _wrap_StyledTextCtrl_HomeWrap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HomeWrapExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeWrapExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEndWrap", (PyCFunction) _wrap_StyledTextCtrl_LineEndWrap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEndWrapExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndWrapExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_VCHomeWrap", (PyCFunction) _wrap_StyledTextCtrl_VCHomeWrap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_VCHomeWrapExtend", (PyCFunction) _wrap_StyledTextCtrl_VCHomeWrapExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineCopy", (PyCFunction) _wrap_StyledTextCtrl_LineCopy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_MoveCaretInsideView", (PyCFunction) _wrap_StyledTextCtrl_MoveCaretInsideView, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineLength", (PyCFunction) _wrap_StyledTextCtrl_LineLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_StyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_BraceBadLight", (PyCFunction) _wrap_StyledTextCtrl_BraceBadLight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_BraceMatch", (PyCFunction) _wrap_StyledTextCtrl_BraceMatch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetViewEOL", (PyCFunction) _wrap_StyledTextCtrl_GetViewEOL, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetViewEOL", (PyCFunction) _wrap_StyledTextCtrl_SetViewEOL, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetDocPointer", (PyCFunction) _wrap_StyledTextCtrl_GetDocPointer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetDocPointer", (PyCFunction) _wrap_StyledTextCtrl_SetDocPointer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetModEventMask", (PyCFunction) _wrap_StyledTextCtrl_SetModEventMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetEdgeColumn", (PyCFunction) _wrap_StyledTextCtrl_GetEdgeColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetEdgeColumn", (PyCFunction) _wrap_StyledTextCtrl_SetEdgeColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetEdgeMode", (PyCFunction) _wrap_StyledTextCtrl_GetEdgeMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetEdgeMode", (PyCFunction) _wrap_StyledTextCtrl_SetEdgeMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetEdgeColour", (PyCFunction) _wrap_StyledTextCtrl_GetEdgeColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetEdgeColour", (PyCFunction) _wrap_StyledTextCtrl_SetEdgeColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SearchAnchor", (PyCFunction) _wrap_StyledTextCtrl_SearchAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SearchNext", (PyCFunction) _wrap_StyledTextCtrl_SearchNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SearchPrev", (PyCFunction) _wrap_StyledTextCtrl_SearchPrev, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LinesOnScreen", (PyCFunction) _wrap_StyledTextCtrl_LinesOnScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_UsePopUp", (PyCFunction) _wrap_StyledTextCtrl_UsePopUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SelectionIsRectangle", (PyCFunction) _wrap_StyledTextCtrl_SelectionIsRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetZoom", (PyCFunction) _wrap_StyledTextCtrl_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetZoom", (PyCFunction) _wrap_StyledTextCtrl_GetZoom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CreateDocument", (PyCFunction) _wrap_StyledTextCtrl_CreateDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AddRefDocument", (PyCFunction) _wrap_StyledTextCtrl_AddRefDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ReleaseDocument", (PyCFunction) _wrap_StyledTextCtrl_ReleaseDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetModEventMask", (PyCFunction) _wrap_StyledTextCtrl_GetModEventMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSTCFocus", (PyCFunction) _wrap_StyledTextCtrl_SetSTCFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSTCFocus", (PyCFunction) _wrap_StyledTextCtrl_GetSTCFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetStatus", (PyCFunction) _wrap_StyledTextCtrl_SetStatus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetStatus", (PyCFunction) _wrap_StyledTextCtrl_GetStatus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMouseDownCaptures", (PyCFunction) _wrap_StyledTextCtrl_SetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetMouseDownCaptures", (PyCFunction) _wrap_StyledTextCtrl_GetMouseDownCaptures, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSTCCursor", (PyCFunction) _wrap_StyledTextCtrl_SetSTCCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSTCCursor", (PyCFunction) _wrap_StyledTextCtrl_GetSTCCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetControlCharSymbol", (PyCFunction) _wrap_StyledTextCtrl_SetControlCharSymbol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetControlCharSymbol", (PyCFunction) _wrap_StyledTextCtrl_GetControlCharSymbol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordPartLeft", (PyCFunction) _wrap_StyledTextCtrl_WordPartLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordPartLeftExtend", (PyCFunction) _wrap_StyledTextCtrl_WordPartLeftExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordPartRight", (PyCFunction) _wrap_StyledTextCtrl_WordPartRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordPartRightExtend", (PyCFunction) _wrap_StyledTextCtrl_WordPartRightExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetVisiblePolicy", (PyCFunction) _wrap_StyledTextCtrl_SetVisiblePolicy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DelLineLeft", (PyCFunction) _wrap_StyledTextCtrl_DelLineLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DelLineRight", (PyCFunction) _wrap_StyledTextCtrl_DelLineRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetXOffset", (PyCFunction) _wrap_StyledTextCtrl_SetXOffset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetXOffset", (PyCFunction) _wrap_StyledTextCtrl_GetXOffset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ChooseCaretX", (PyCFunction) _wrap_StyledTextCtrl_ChooseCaretX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetXCaretPolicy", (PyCFunction) _wrap_StyledTextCtrl_SetXCaretPolicy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetYCaretPolicy", (PyCFunction) _wrap_StyledTextCtrl_SetYCaretPolicy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetPrintWrapMode", (PyCFunction) _wrap_StyledTextCtrl_SetPrintWrapMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetPrintWrapMode", (PyCFunction) _wrap_StyledTextCtrl_GetPrintWrapMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetHotspotActiveForeground", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotActiveForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetHotspotActiveBackground", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotActiveBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetHotspotActiveUnderline", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotActiveUnderline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetHotspotSingleLine", (PyCFunction) _wrap_StyledTextCtrl_SetHotspotSingleLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ParaDown", (PyCFunction) _wrap_StyledTextCtrl_ParaDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ParaDownExtend", (PyCFunction) _wrap_StyledTextCtrl_ParaDownExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ParaUp", (PyCFunction) _wrap_StyledTextCtrl_ParaUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ParaUpExtend", (PyCFunction) _wrap_StyledTextCtrl_ParaUpExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PositionBefore", (PyCFunction) _wrap_StyledTextCtrl_PositionBefore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PositionAfter", (PyCFunction) _wrap_StyledTextCtrl_PositionAfter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CopyRange", (PyCFunction) _wrap_StyledTextCtrl_CopyRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CopyText", (PyCFunction) _wrap_StyledTextCtrl_CopyText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetSelectionMode", (PyCFunction) _wrap_StyledTextCtrl_SetSelectionMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSelectionMode", (PyCFunction) _wrap_StyledTextCtrl_GetSelectionMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineSelStartPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineSelStartPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLineSelEndPosition", (PyCFunction) _wrap_StyledTextCtrl_GetLineSelEndPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineDownRectExtend", (PyCFunction) _wrap_StyledTextCtrl_LineDownRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineUpRectExtend", (PyCFunction) _wrap_StyledTextCtrl_LineUpRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CharLeftRectExtend", (PyCFunction) _wrap_StyledTextCtrl_CharLeftRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CharRightRectExtend", (PyCFunction) _wrap_StyledTextCtrl_CharRightRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_HomeRectExtend", (PyCFunction) _wrap_StyledTextCtrl_HomeRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_VCHomeRectExtend", (PyCFunction) _wrap_StyledTextCtrl_VCHomeRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LineEndRectExtend", (PyCFunction) _wrap_StyledTextCtrl_LineEndRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PageUpRectExtend", (PyCFunction) _wrap_StyledTextCtrl_PageUpRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PageDownRectExtend", (PyCFunction) _wrap_StyledTextCtrl_PageDownRectExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StutteredPageUp", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StutteredPageUpExtend", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageUpExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StutteredPageDown", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StutteredPageDownExtend", (PyCFunction) _wrap_StyledTextCtrl_StutteredPageDownExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordLeftEnd", (PyCFunction) _wrap_StyledTextCtrl_WordLeftEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordLeftEndExtend", (PyCFunction) _wrap_StyledTextCtrl_WordLeftEndExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordRightEnd", (PyCFunction) _wrap_StyledTextCtrl_WordRightEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_WordRightEndExtend", (PyCFunction) _wrap_StyledTextCtrl_WordRightEndExtend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetWhitespaceChars", (PyCFunction) _wrap_StyledTextCtrl_SetWhitespaceChars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetCharsDefault", (PyCFunction) _wrap_StyledTextCtrl_SetCharsDefault, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_AutoCompGetCurrent", (PyCFunction) _wrap_StyledTextCtrl_AutoCompGetCurrent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StartRecord", (PyCFunction) _wrap_StyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StopRecord", (PyCFunction) _wrap_StyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetLexer", (PyCFunction) _wrap_StyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLexer", (PyCFunction) _wrap_StyledTextCtrl_GetLexer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_Colourise", (PyCFunction) _wrap_StyledTextCtrl_Colourise, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetProperty", (PyCFunction) _wrap_StyledTextCtrl_SetProperty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetKeyWords", (PyCFunction) _wrap_StyledTextCtrl_SetKeyWords, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetLexerLanguage", (PyCFunction) _wrap_StyledTextCtrl_SetLexerLanguage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetCurrentLine", (PyCFunction) _wrap_StyledTextCtrl_GetCurrentLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetSpec", (PyCFunction) _wrap_StyledTextCtrl_StyleSetSpec, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetFont", (PyCFunction) _wrap_StyledTextCtrl_StyleSetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_StyleSetFontAttr", (PyCFunction) _wrap_StyledTextCtrl_StyleSetFontAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_CmdKeyExecute", (PyCFunction) _wrap_StyledTextCtrl_CmdKeyExecute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetMargins", (PyCFunction) _wrap_StyledTextCtrl_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetSelection", (PyCFunction) _wrap_StyledTextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_PointFromPosition", (PyCFunction) _wrap_StyledTextCtrl_PointFromPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ScrollToLine", (PyCFunction) _wrap_StyledTextCtrl_ScrollToLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_ScrollToColumn", (PyCFunction) _wrap_StyledTextCtrl_ScrollToColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SendMsg", (PyCFunction) _wrap_StyledTextCtrl_SendMsg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetVScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetVScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetHScrollBar", (PyCFunction) _wrap_StyledTextCtrl_SetHScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetLastKeydownProcessed", (PyCFunction) _wrap_StyledTextCtrl_GetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetLastKeydownProcessed", (PyCFunction) _wrap_StyledTextCtrl_SetLastKeydownProcessed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SaveFile", (PyCFunction) _wrap_StyledTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_LoadFile", (PyCFunction) _wrap_StyledTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DoDragOver", (PyCFunction) _wrap_StyledTextCtrl_DoDragOver, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetPosition", (PyCFunction) _wrap_StyledTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetKey", (PyCFunction) _wrap_StyledTextEvent_SetKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetModifiers", (PyCFunction) _wrap_StyledTextEvent_SetModifiers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetModificationType", (PyCFunction) _wrap_StyledTextEvent_SetModificationType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetText", (PyCFunction) _wrap_StyledTextEvent_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetLength", (PyCFunction) _wrap_StyledTextEvent_SetLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetLinesAdded", (PyCFunction) _wrap_StyledTextEvent_SetLinesAdded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetLine", (PyCFunction) _wrap_StyledTextEvent_SetLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetFoldLevelNow", (PyCFunction) _wrap_StyledTextEvent_SetFoldLevelNow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetFoldLevelPrev", (PyCFunction) _wrap_StyledTextEvent_SetFoldLevelPrev, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetMargin", (PyCFunction) _wrap_StyledTextEvent_SetMargin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetMessage", (PyCFunction) _wrap_StyledTextEvent_SetMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetWParam", (PyCFunction) _wrap_StyledTextEvent_SetWParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetLParam", (PyCFunction) _wrap_StyledTextEvent_SetLParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetListType", (PyCFunction) _wrap_StyledTextEvent_SetListType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetX", (PyCFunction) _wrap_StyledTextEvent_SetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetY", (PyCFunction) _wrap_StyledTextEvent_SetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetDragText", (PyCFunction) _wrap_StyledTextEvent_SetDragText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetDragAllowMove", (PyCFunction) _wrap_StyledTextEvent_SetDragAllowMove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_SetDragResult", (PyCFunction) _wrap_StyledTextEvent_SetDragResult, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetPosition", (PyCFunction) _wrap_StyledTextEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetKey", (PyCFunction) _wrap_StyledTextEvent_GetKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetModifiers", (PyCFunction) _wrap_StyledTextEvent_GetModifiers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetModificationType", (PyCFunction) _wrap_StyledTextEvent_GetModificationType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetText", (PyCFunction) _wrap_StyledTextEvent_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetLength", (PyCFunction) _wrap_StyledTextEvent_GetLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetLinesAdded", (PyCFunction) _wrap_StyledTextEvent_GetLinesAdded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetLine", (PyCFunction) _wrap_StyledTextEvent_GetLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetFoldLevelNow", (PyCFunction) _wrap_StyledTextEvent_GetFoldLevelNow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetFoldLevelPrev", (PyCFunction) _wrap_StyledTextEvent_GetFoldLevelPrev, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetMargin", (PyCFunction) _wrap_StyledTextEvent_GetMargin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetMessage", (PyCFunction) _wrap_StyledTextEvent_GetMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetWParam", (PyCFunction) _wrap_StyledTextEvent_GetWParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetLParam", (PyCFunction) _wrap_StyledTextEvent_GetLParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetListType", (PyCFunction) _wrap_StyledTextEvent_GetListType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetX", (PyCFunction) _wrap_StyledTextEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetY", (PyCFunction) _wrap_StyledTextEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetDragText", (PyCFunction) _wrap_StyledTextEvent_GetDragText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetDragAllowMove", (PyCFunction) _wrap_StyledTextEvent_GetDragAllowMove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetDragResult", (PyCFunction) _wrap_StyledTextEvent_GetDragResult, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetShift", (PyCFunction) _wrap_StyledTextEvent_GetShift, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetControl", (PyCFunction) _wrap_StyledTextEvent_GetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_GetAlt", (PyCFunction) _wrap_StyledTextEvent_GetAlt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_Clone", (PyCFunction) _wrap_StyledTextEvent_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StyledTextEvent_swigregister", StyledTextEvent_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -15463,7 +15551,7 @@ _swigt__p_wxMemoryBuffer,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -15491,913 +15579,913 @@ SWIGEXPORT(void) SWIG_init(void) {
     
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"STCNameStr",_wrap_STCNameStr_get, _wrap_STCNameStr_set);
-    PyDict_SetItemString(d,"STC_USE_DND", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_USE_POPUP", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_INVALID_POSITION", SWIG_FromInt((int)-1));
-    PyDict_SetItemString(d,"STC_START", SWIG_FromInt((int)2000));
-    PyDict_SetItemString(d,"STC_OPTIONAL_START", SWIG_FromInt((int)3000));
-    PyDict_SetItemString(d,"STC_LEXER_START", SWIG_FromInt((int)4000));
-    PyDict_SetItemString(d,"STC_WS_INVISIBLE", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_WS_VISIBLEALWAYS", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_WS_VISIBLEAFTERINDENT", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_EOL_CRLF", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_EOL_CR", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_EOL_LF", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CP_UTF8", SWIG_FromInt((int)65001));
-    PyDict_SetItemString(d,"STC_CP_DBCS", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_MARKER_MAX", SWIG_FromInt((int)31));
-    PyDict_SetItemString(d,"STC_MARK_CIRCLE", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_MARK_ROUNDRECT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_MARK_ARROW", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_MARK_SMALLRECT", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_MARK_SHORTARROW", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_MARK_EMPTY", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_MARK_ARROWDOWN", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_MARK_MINUS", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_MARK_PLUS", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_MARK_VLINE", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_MARK_LCORNER", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_MARK_TCORNER", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_MARK_BOXPLUS", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_MARK_BOXPLUSCONNECTED", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_MARK_BOXMINUS", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_MARK_BOXMINUSCONNECTED", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_MARK_LCORNERCURVE", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_MARK_TCORNERCURVE", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_MARK_CIRCLEPLUS", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_MARK_CIRCLEPLUSCONNECTED", SWIG_FromInt((int)19));
-    PyDict_SetItemString(d,"STC_MARK_CIRCLEMINUS", SWIG_FromInt((int)20));
-    PyDict_SetItemString(d,"STC_MARK_CIRCLEMINUSCONNECTED", SWIG_FromInt((int)21));
-    PyDict_SetItemString(d,"STC_MARK_BACKGROUND", SWIG_FromInt((int)22));
-    PyDict_SetItemString(d,"STC_MARK_DOTDOTDOT", SWIG_FromInt((int)23));
-    PyDict_SetItemString(d,"STC_MARK_ARROWS", SWIG_FromInt((int)24));
-    PyDict_SetItemString(d,"STC_MARK_PIXMAP", SWIG_FromInt((int)25));
-    PyDict_SetItemString(d,"STC_MARK_CHARACTER", SWIG_FromInt((int)10000));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDEREND", SWIG_FromInt((int)25));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDEROPENMID", SWIG_FromInt((int)26));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDERMIDTAIL", SWIG_FromInt((int)27));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDERTAIL", SWIG_FromInt((int)28));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDERSUB", SWIG_FromInt((int)29));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDER", SWIG_FromInt((int)30));
-    PyDict_SetItemString(d,"STC_MARKNUM_FOLDEROPEN", SWIG_FromInt((int)31));
-    PyDict_SetItemString(d,"STC_MASK_FOLDERS", SWIG_FromInt((int)0xFE000000));
-    PyDict_SetItemString(d,"STC_MARGIN_SYMBOL", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_MARGIN_NUMBER", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_STYLE_DEFAULT", SWIG_FromInt((int)32));
-    PyDict_SetItemString(d,"STC_STYLE_LINENUMBER", SWIG_FromInt((int)33));
-    PyDict_SetItemString(d,"STC_STYLE_BRACELIGHT", SWIG_FromInt((int)34));
-    PyDict_SetItemString(d,"STC_STYLE_BRACEBAD", SWIG_FromInt((int)35));
-    PyDict_SetItemString(d,"STC_STYLE_CONTROLCHAR", SWIG_FromInt((int)36));
-    PyDict_SetItemString(d,"STC_STYLE_INDENTGUIDE", SWIG_FromInt((int)37));
-    PyDict_SetItemString(d,"STC_STYLE_LASTPREDEFINED", SWIG_FromInt((int)39));
-    PyDict_SetItemString(d,"STC_STYLE_MAX", SWIG_FromInt((int)127));
-    PyDict_SetItemString(d,"STC_CHARSET_ANSI", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_CHARSET_DEFAULT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CHARSET_BALTIC", SWIG_FromInt((int)186));
-    PyDict_SetItemString(d,"STC_CHARSET_CHINESEBIG5", SWIG_FromInt((int)136));
-    PyDict_SetItemString(d,"STC_CHARSET_EASTEUROPE", SWIG_FromInt((int)238));
-    PyDict_SetItemString(d,"STC_CHARSET_GB2312", SWIG_FromInt((int)134));
-    PyDict_SetItemString(d,"STC_CHARSET_GREEK", SWIG_FromInt((int)161));
-    PyDict_SetItemString(d,"STC_CHARSET_HANGUL", SWIG_FromInt((int)129));
-    PyDict_SetItemString(d,"STC_CHARSET_MAC", SWIG_FromInt((int)77));
-    PyDict_SetItemString(d,"STC_CHARSET_OEM", SWIG_FromInt((int)255));
-    PyDict_SetItemString(d,"STC_CHARSET_RUSSIAN", SWIG_FromInt((int)204));
-    PyDict_SetItemString(d,"STC_CHARSET_SHIFTJIS", SWIG_FromInt((int)128));
-    PyDict_SetItemString(d,"STC_CHARSET_SYMBOL", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CHARSET_TURKISH", SWIG_FromInt((int)162));
-    PyDict_SetItemString(d,"STC_CHARSET_JOHAB", SWIG_FromInt((int)130));
-    PyDict_SetItemString(d,"STC_CHARSET_HEBREW", SWIG_FromInt((int)177));
-    PyDict_SetItemString(d,"STC_CHARSET_ARABIC", SWIG_FromInt((int)178));
-    PyDict_SetItemString(d,"STC_CHARSET_VIETNAMESE", SWIG_FromInt((int)163));
-    PyDict_SetItemString(d,"STC_CHARSET_THAI", SWIG_FromInt((int)222));
-    PyDict_SetItemString(d,"STC_CASE_MIXED", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_CASE_UPPER", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CASE_LOWER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_INDIC_MAX", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_INDIC_PLAIN", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_INDIC_SQUIGGLE", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_INDIC_TT", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_INDIC_DIAGONAL", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_INDIC_STRIKE", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_INDIC_HIDDEN", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_INDIC_BOX", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_INDIC0_MASK", SWIG_FromInt((int)0x20));
-    PyDict_SetItemString(d,"STC_INDIC1_MASK", SWIG_FromInt((int)0x40));
-    PyDict_SetItemString(d,"STC_INDIC2_MASK", SWIG_FromInt((int)0x80));
-    PyDict_SetItemString(d,"STC_INDICS_MASK", SWIG_FromInt((int)0xE0));
-    PyDict_SetItemString(d,"STC_PRINT_NORMAL", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_PRINT_INVERTLIGHT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_PRINT_BLACKONWHITE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_PRINT_COLOURONWHITE", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_PRINT_COLOURONWHITEDEFAULTBG", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_FIND_WHOLEWORD", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_FIND_MATCHCASE", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_FIND_WORDSTART", SWIG_FromInt((int)0x00100000));
-    PyDict_SetItemString(d,"STC_FIND_REGEXP", SWIG_FromInt((int)0x00200000));
-    PyDict_SetItemString(d,"STC_FIND_POSIX", SWIG_FromInt((int)0x00400000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELBASE", SWIG_FromInt((int)0x400));
-    PyDict_SetItemString(d,"STC_FOLDLEVELWHITEFLAG", SWIG_FromInt((int)0x1000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELHEADERFLAG", SWIG_FromInt((int)0x2000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELBOXHEADERFLAG", SWIG_FromInt((int)0x4000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELBOXFOOTERFLAG", SWIG_FromInt((int)0x8000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELCONTRACTED", SWIG_FromInt((int)0x10000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELUNINDENT", SWIG_FromInt((int)0x20000));
-    PyDict_SetItemString(d,"STC_FOLDLEVELNUMBERMASK", SWIG_FromInt((int)0x0FFF));
-    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEBEFORE_EXPANDED", SWIG_FromInt((int)0x0002));
-    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEBEFORE_CONTRACTED", SWIG_FromInt((int)0x0004));
-    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEAFTER_EXPANDED", SWIG_FromInt((int)0x0008));
-    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEAFTER_CONTRACTED", SWIG_FromInt((int)0x0010));
-    PyDict_SetItemString(d,"STC_FOLDFLAG_LEVELNUMBERS", SWIG_FromInt((int)0x0040));
-    PyDict_SetItemString(d,"STC_FOLDFLAG_BOX", SWIG_FromInt((int)0x0001));
-    PyDict_SetItemString(d,"STC_TIME_FOREVER", SWIG_FromInt((int)10000000));
-    PyDict_SetItemString(d,"STC_WRAP_NONE", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_WRAP_WORD", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CACHE_NONE", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_CACHE_CARET", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CACHE_PAGE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CACHE_DOCUMENT", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_EDGE_NONE", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_EDGE_LINE", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_EDGE_BACKGROUND", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CURSORNORMAL", SWIG_FromInt((int)-1));
-    PyDict_SetItemString(d,"STC_CURSORWAIT", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_VISIBLE_SLOP", SWIG_FromInt((int)0x01));
-    PyDict_SetItemString(d,"STC_VISIBLE_STRICT", SWIG_FromInt((int)0x04));
-    PyDict_SetItemString(d,"STC_CARET_SLOP", SWIG_FromInt((int)0x01));
-    PyDict_SetItemString(d,"STC_CARET_STRICT", SWIG_FromInt((int)0x04));
-    PyDict_SetItemString(d,"STC_CARET_JUMPS", SWIG_FromInt((int)0x10));
-    PyDict_SetItemString(d,"STC_CARET_EVEN", SWIG_FromInt((int)0x08));
-    PyDict_SetItemString(d,"STC_SEL_STREAM", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_SEL_RECTANGLE", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_SEL_LINES", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_KEYWORDSET_MAX", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_MOD_INSERTTEXT", SWIG_FromInt((int)0x1));
-    PyDict_SetItemString(d,"STC_MOD_DELETETEXT", SWIG_FromInt((int)0x2));
-    PyDict_SetItemString(d,"STC_MOD_CHANGESTYLE", SWIG_FromInt((int)0x4));
-    PyDict_SetItemString(d,"STC_MOD_CHANGEFOLD", SWIG_FromInt((int)0x8));
-    PyDict_SetItemString(d,"STC_PERFORMED_USER", SWIG_FromInt((int)0x10));
-    PyDict_SetItemString(d,"STC_PERFORMED_UNDO", SWIG_FromInt((int)0x20));
-    PyDict_SetItemString(d,"STC_PERFORMED_REDO", SWIG_FromInt((int)0x40));
-    PyDict_SetItemString(d,"STC_LASTSTEPINUNDOREDO", SWIG_FromInt((int)0x100));
-    PyDict_SetItemString(d,"STC_MOD_CHANGEMARKER", SWIG_FromInt((int)0x200));
-    PyDict_SetItemString(d,"STC_MOD_BEFOREINSERT", SWIG_FromInt((int)0x400));
-    PyDict_SetItemString(d,"STC_MOD_BEFOREDELETE", SWIG_FromInt((int)0x800));
-    PyDict_SetItemString(d,"STC_MODEVENTMASKALL", SWIG_FromInt((int)0xF77));
-    PyDict_SetItemString(d,"STC_KEY_DOWN", SWIG_FromInt((int)300));
-    PyDict_SetItemString(d,"STC_KEY_UP", SWIG_FromInt((int)301));
-    PyDict_SetItemString(d,"STC_KEY_LEFT", SWIG_FromInt((int)302));
-    PyDict_SetItemString(d,"STC_KEY_RIGHT", SWIG_FromInt((int)303));
-    PyDict_SetItemString(d,"STC_KEY_HOME", SWIG_FromInt((int)304));
-    PyDict_SetItemString(d,"STC_KEY_END", SWIG_FromInt((int)305));
-    PyDict_SetItemString(d,"STC_KEY_PRIOR", SWIG_FromInt((int)306));
-    PyDict_SetItemString(d,"STC_KEY_NEXT", SWIG_FromInt((int)307));
-    PyDict_SetItemString(d,"STC_KEY_DELETE", SWIG_FromInt((int)308));
-    PyDict_SetItemString(d,"STC_KEY_INSERT", SWIG_FromInt((int)309));
-    PyDict_SetItemString(d,"STC_KEY_ESCAPE", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_KEY_BACK", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_KEY_TAB", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_KEY_RETURN", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_KEY_ADD", SWIG_FromInt((int)310));
-    PyDict_SetItemString(d,"STC_KEY_SUBTRACT", SWIG_FromInt((int)311));
-    PyDict_SetItemString(d,"STC_KEY_DIVIDE", SWIG_FromInt((int)312));
-    PyDict_SetItemString(d,"STC_SCMOD_SHIFT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_SCMOD_CTRL", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_SCMOD_ALT", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_LEX_CONTAINER", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_LEX_NULL", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_LEX_PYTHON", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_LEX_CPP", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_LEX_HTML", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_LEX_XML", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_LEX_PERL", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_LEX_SQL", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_LEX_VB", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_LEX_PROPERTIES", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_LEX_ERRORLIST", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_LEX_MAKEFILE", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_LEX_BATCH", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_LEX_XCODE", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_LEX_LATEX", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_LEX_LUA", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_LEX_DIFF", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_LEX_CONF", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_LEX_PASCAL", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_LEX_AVE", SWIG_FromInt((int)19));
-    PyDict_SetItemString(d,"STC_LEX_ADA", SWIG_FromInt((int)20));
-    PyDict_SetItemString(d,"STC_LEX_LISP", SWIG_FromInt((int)21));
-    PyDict_SetItemString(d,"STC_LEX_RUBY", SWIG_FromInt((int)22));
-    PyDict_SetItemString(d,"STC_LEX_EIFFEL", SWIG_FromInt((int)23));
-    PyDict_SetItemString(d,"STC_LEX_EIFFELKW", SWIG_FromInt((int)24));
-    PyDict_SetItemString(d,"STC_LEX_TCL", SWIG_FromInt((int)25));
-    PyDict_SetItemString(d,"STC_LEX_NNCRONTAB", SWIG_FromInt((int)26));
-    PyDict_SetItemString(d,"STC_LEX_BULLANT", SWIG_FromInt((int)27));
-    PyDict_SetItemString(d,"STC_LEX_VBSCRIPT", SWIG_FromInt((int)28));
-    PyDict_SetItemString(d,"STC_LEX_ASP", SWIG_FromInt((int)29));
-    PyDict_SetItemString(d,"STC_LEX_PHP", SWIG_FromInt((int)30));
-    PyDict_SetItemString(d,"STC_LEX_BAAN", SWIG_FromInt((int)31));
-    PyDict_SetItemString(d,"STC_LEX_MATLAB", SWIG_FromInt((int)32));
-    PyDict_SetItemString(d,"STC_LEX_SCRIPTOL", SWIG_FromInt((int)33));
-    PyDict_SetItemString(d,"STC_LEX_ASM", SWIG_FromInt((int)34));
-    PyDict_SetItemString(d,"STC_LEX_CPPNOCASE", SWIG_FromInt((int)35));
-    PyDict_SetItemString(d,"STC_LEX_FORTRAN", SWIG_FromInt((int)36));
-    PyDict_SetItemString(d,"STC_LEX_F77", SWIG_FromInt((int)37));
-    PyDict_SetItemString(d,"STC_LEX_CSS", SWIG_FromInt((int)38));
-    PyDict_SetItemString(d,"STC_LEX_POV", SWIG_FromInt((int)39));
-    PyDict_SetItemString(d,"STC_LEX_LOUT", SWIG_FromInt((int)40));
-    PyDict_SetItemString(d,"STC_LEX_ESCRIPT", SWIG_FromInt((int)41));
-    PyDict_SetItemString(d,"STC_LEX_PS", SWIG_FromInt((int)42));
-    PyDict_SetItemString(d,"STC_LEX_NSIS", SWIG_FromInt((int)43));
-    PyDict_SetItemString(d,"STC_LEX_MMIXAL", SWIG_FromInt((int)44));
-    PyDict_SetItemString(d,"STC_LEX_CLW", SWIG_FromInt((int)45));
-    PyDict_SetItemString(d,"STC_LEX_CLWNOCASE", SWIG_FromInt((int)46));
-    PyDict_SetItemString(d,"STC_LEX_LOT", SWIG_FromInt((int)47));
-    PyDict_SetItemString(d,"STC_LEX_YAML", SWIG_FromInt((int)48));
-    PyDict_SetItemString(d,"STC_LEX_TEX", SWIG_FromInt((int)49));
-    PyDict_SetItemString(d,"STC_LEX_METAPOST", SWIG_FromInt((int)50));
-    PyDict_SetItemString(d,"STC_LEX_POWERBASIC", SWIG_FromInt((int)51));
-    PyDict_SetItemString(d,"STC_LEX_FORTH", SWIG_FromInt((int)52));
-    PyDict_SetItemString(d,"STC_LEX_ERLANG", SWIG_FromInt((int)53));
-    PyDict_SetItemString(d,"STC_LEX_OCTAVE", SWIG_FromInt((int)54));
-    PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_FromInt((int)1000));
-    PyDict_SetItemString(d,"STC_P_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_P_COMMENTLINE", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_P_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_P_STRING", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_P_CHARACTER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_P_WORD", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_P_TRIPLE", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_P_TRIPLEDOUBLE", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_P_CLASSNAME", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_P_DEFNAME", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_P_OPERATOR", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_P_IDENTIFIER", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_P_COMMENTBLOCK", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_P_STRINGEOL", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_C_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_C_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_C_COMMENTLINE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_C_COMMENTDOC", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_C_NUMBER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_C_WORD", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_C_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_C_CHARACTER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_C_UUID", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_C_PREPROCESSOR", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_C_OPERATOR", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_C_IDENTIFIER", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_C_STRINGEOL", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_C_VERBATIM", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_C_REGEX", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_C_COMMENTLINEDOC", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_C_WORD2", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_C_COMMENTDOCKEYWORD", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_C_COMMENTDOCKEYWORDERROR", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_C_GLOBALCLASS", SWIG_FromInt((int)19));
-    PyDict_SetItemString(d,"STC_H_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_H_TAG", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_H_TAGUNKNOWN", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_H_ATTRIBUTE", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_H_ATTRIBUTEUNKNOWN", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_H_NUMBER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_H_DOUBLESTRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_H_SINGLESTRING", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_H_OTHER", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_H_COMMENT", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_H_ENTITY", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_H_TAGEND", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_H_XMLSTART", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_H_XMLEND", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_H_SCRIPT", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_H_ASP", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_H_ASPAT", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_H_CDATA", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_H_QUESTION", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_H_VALUE", SWIG_FromInt((int)19));
-    PyDict_SetItemString(d,"STC_H_XCCOMMENT", SWIG_FromInt((int)20));
-    PyDict_SetItemString(d,"STC_H_SGML_DEFAULT", SWIG_FromInt((int)21));
-    PyDict_SetItemString(d,"STC_H_SGML_COMMAND", SWIG_FromInt((int)22));
-    PyDict_SetItemString(d,"STC_H_SGML_1ST_PARAM", SWIG_FromInt((int)23));
-    PyDict_SetItemString(d,"STC_H_SGML_DOUBLESTRING", SWIG_FromInt((int)24));
-    PyDict_SetItemString(d,"STC_H_SGML_SIMPLESTRING", SWIG_FromInt((int)25));
-    PyDict_SetItemString(d,"STC_H_SGML_ERROR", SWIG_FromInt((int)26));
-    PyDict_SetItemString(d,"STC_H_SGML_SPECIAL", SWIG_FromInt((int)27));
-    PyDict_SetItemString(d,"STC_H_SGML_ENTITY", SWIG_FromInt((int)28));
-    PyDict_SetItemString(d,"STC_H_SGML_COMMENT", SWIG_FromInt((int)29));
-    PyDict_SetItemString(d,"STC_H_SGML_1ST_PARAM_COMMENT", SWIG_FromInt((int)30));
-    PyDict_SetItemString(d,"STC_H_SGML_BLOCK_DEFAULT", SWIG_FromInt((int)31));
-    PyDict_SetItemString(d,"STC_HJ_START", SWIG_FromInt((int)40));
-    PyDict_SetItemString(d,"STC_HJ_DEFAULT", SWIG_FromInt((int)41));
-    PyDict_SetItemString(d,"STC_HJ_COMMENT", SWIG_FromInt((int)42));
-    PyDict_SetItemString(d,"STC_HJ_COMMENTLINE", SWIG_FromInt((int)43));
-    PyDict_SetItemString(d,"STC_HJ_COMMENTDOC", SWIG_FromInt((int)44));
-    PyDict_SetItemString(d,"STC_HJ_NUMBER", SWIG_FromInt((int)45));
-    PyDict_SetItemString(d,"STC_HJ_WORD", SWIG_FromInt((int)46));
-    PyDict_SetItemString(d,"STC_HJ_KEYWORD", SWIG_FromInt((int)47));
-    PyDict_SetItemString(d,"STC_HJ_DOUBLESTRING", SWIG_FromInt((int)48));
-    PyDict_SetItemString(d,"STC_HJ_SINGLESTRING", SWIG_FromInt((int)49));
-    PyDict_SetItemString(d,"STC_HJ_SYMBOLS", SWIG_FromInt((int)50));
-    PyDict_SetItemString(d,"STC_HJ_STRINGEOL", SWIG_FromInt((int)51));
-    PyDict_SetItemString(d,"STC_HJ_REGEX", SWIG_FromInt((int)52));
-    PyDict_SetItemString(d,"STC_HJA_START", SWIG_FromInt((int)55));
-    PyDict_SetItemString(d,"STC_HJA_DEFAULT", SWIG_FromInt((int)56));
-    PyDict_SetItemString(d,"STC_HJA_COMMENT", SWIG_FromInt((int)57));
-    PyDict_SetItemString(d,"STC_HJA_COMMENTLINE", SWIG_FromInt((int)58));
-    PyDict_SetItemString(d,"STC_HJA_COMMENTDOC", SWIG_FromInt((int)59));
-    PyDict_SetItemString(d,"STC_HJA_NUMBER", SWIG_FromInt((int)60));
-    PyDict_SetItemString(d,"STC_HJA_WORD", SWIG_FromInt((int)61));
-    PyDict_SetItemString(d,"STC_HJA_KEYWORD", SWIG_FromInt((int)62));
-    PyDict_SetItemString(d,"STC_HJA_DOUBLESTRING", SWIG_FromInt((int)63));
-    PyDict_SetItemString(d,"STC_HJA_SINGLESTRING", SWIG_FromInt((int)64));
-    PyDict_SetItemString(d,"STC_HJA_SYMBOLS", SWIG_FromInt((int)65));
-    PyDict_SetItemString(d,"STC_HJA_STRINGEOL", SWIG_FromInt((int)66));
-    PyDict_SetItemString(d,"STC_HJA_REGEX", SWIG_FromInt((int)67));
-    PyDict_SetItemString(d,"STC_HB_START", SWIG_FromInt((int)70));
-    PyDict_SetItemString(d,"STC_HB_DEFAULT", SWIG_FromInt((int)71));
-    PyDict_SetItemString(d,"STC_HB_COMMENTLINE", SWIG_FromInt((int)72));
-    PyDict_SetItemString(d,"STC_HB_NUMBER", SWIG_FromInt((int)73));
-    PyDict_SetItemString(d,"STC_HB_WORD", SWIG_FromInt((int)74));
-    PyDict_SetItemString(d,"STC_HB_STRING", SWIG_FromInt((int)75));
-    PyDict_SetItemString(d,"STC_HB_IDENTIFIER", SWIG_FromInt((int)76));
-    PyDict_SetItemString(d,"STC_HB_STRINGEOL", SWIG_FromInt((int)77));
-    PyDict_SetItemString(d,"STC_HBA_START", SWIG_FromInt((int)80));
-    PyDict_SetItemString(d,"STC_HBA_DEFAULT", SWIG_FromInt((int)81));
-    PyDict_SetItemString(d,"STC_HBA_COMMENTLINE", SWIG_FromInt((int)82));
-    PyDict_SetItemString(d,"STC_HBA_NUMBER", SWIG_FromInt((int)83));
-    PyDict_SetItemString(d,"STC_HBA_WORD", SWIG_FromInt((int)84));
-    PyDict_SetItemString(d,"STC_HBA_STRING", SWIG_FromInt((int)85));
-    PyDict_SetItemString(d,"STC_HBA_IDENTIFIER", SWIG_FromInt((int)86));
-    PyDict_SetItemString(d,"STC_HBA_STRINGEOL", SWIG_FromInt((int)87));
-    PyDict_SetItemString(d,"STC_HP_START", SWIG_FromInt((int)90));
-    PyDict_SetItemString(d,"STC_HP_DEFAULT", SWIG_FromInt((int)91));
-    PyDict_SetItemString(d,"STC_HP_COMMENTLINE", SWIG_FromInt((int)92));
-    PyDict_SetItemString(d,"STC_HP_NUMBER", SWIG_FromInt((int)93));
-    PyDict_SetItemString(d,"STC_HP_STRING", SWIG_FromInt((int)94));
-    PyDict_SetItemString(d,"STC_HP_CHARACTER", SWIG_FromInt((int)95));
-    PyDict_SetItemString(d,"STC_HP_WORD", SWIG_FromInt((int)96));
-    PyDict_SetItemString(d,"STC_HP_TRIPLE", SWIG_FromInt((int)97));
-    PyDict_SetItemString(d,"STC_HP_TRIPLEDOUBLE", SWIG_FromInt((int)98));
-    PyDict_SetItemString(d,"STC_HP_CLASSNAME", SWIG_FromInt((int)99));
-    PyDict_SetItemString(d,"STC_HP_DEFNAME", SWIG_FromInt((int)100));
-    PyDict_SetItemString(d,"STC_HP_OPERATOR", SWIG_FromInt((int)101));
-    PyDict_SetItemString(d,"STC_HP_IDENTIFIER", SWIG_FromInt((int)102));
-    PyDict_SetItemString(d,"STC_HPA_START", SWIG_FromInt((int)105));
-    PyDict_SetItemString(d,"STC_HPA_DEFAULT", SWIG_FromInt((int)106));
-    PyDict_SetItemString(d,"STC_HPA_COMMENTLINE", SWIG_FromInt((int)107));
-    PyDict_SetItemString(d,"STC_HPA_NUMBER", SWIG_FromInt((int)108));
-    PyDict_SetItemString(d,"STC_HPA_STRING", SWIG_FromInt((int)109));
-    PyDict_SetItemString(d,"STC_HPA_CHARACTER", SWIG_FromInt((int)110));
-    PyDict_SetItemString(d,"STC_HPA_WORD", SWIG_FromInt((int)111));
-    PyDict_SetItemString(d,"STC_HPA_TRIPLE", SWIG_FromInt((int)112));
-    PyDict_SetItemString(d,"STC_HPA_TRIPLEDOUBLE", SWIG_FromInt((int)113));
-    PyDict_SetItemString(d,"STC_HPA_CLASSNAME", SWIG_FromInt((int)114));
-    PyDict_SetItemString(d,"STC_HPA_DEFNAME", SWIG_FromInt((int)115));
-    PyDict_SetItemString(d,"STC_HPA_OPERATOR", SWIG_FromInt((int)116));
-    PyDict_SetItemString(d,"STC_HPA_IDENTIFIER", SWIG_FromInt((int)117));
-    PyDict_SetItemString(d,"STC_HPHP_DEFAULT", SWIG_FromInt((int)118));
-    PyDict_SetItemString(d,"STC_HPHP_HSTRING", SWIG_FromInt((int)119));
-    PyDict_SetItemString(d,"STC_HPHP_SIMPLESTRING", SWIG_FromInt((int)120));
-    PyDict_SetItemString(d,"STC_HPHP_WORD", SWIG_FromInt((int)121));
-    PyDict_SetItemString(d,"STC_HPHP_NUMBER", SWIG_FromInt((int)122));
-    PyDict_SetItemString(d,"STC_HPHP_VARIABLE", SWIG_FromInt((int)123));
-    PyDict_SetItemString(d,"STC_HPHP_COMMENT", SWIG_FromInt((int)124));
-    PyDict_SetItemString(d,"STC_HPHP_COMMENTLINE", SWIG_FromInt((int)125));
-    PyDict_SetItemString(d,"STC_HPHP_HSTRING_VARIABLE", SWIG_FromInt((int)126));
-    PyDict_SetItemString(d,"STC_HPHP_OPERATOR", SWIG_FromInt((int)127));
-    PyDict_SetItemString(d,"STC_PL_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_PL_ERROR", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_PL_COMMENTLINE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_PL_POD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_PL_NUMBER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_PL_WORD", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_PL_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_PL_CHARACTER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_PL_PUNCTUATION", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_PL_PREPROCESSOR", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_PL_OPERATOR", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_PL_IDENTIFIER", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_PL_SCALAR", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_PL_ARRAY", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_PL_HASH", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_PL_SYMBOLTABLE", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_PL_REGEX", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_PL_REGSUBST", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_PL_LONGQUOTE", SWIG_FromInt((int)19));
-    PyDict_SetItemString(d,"STC_PL_BACKTICKS", SWIG_FromInt((int)20));
-    PyDict_SetItemString(d,"STC_PL_DATASECTION", SWIG_FromInt((int)21));
-    PyDict_SetItemString(d,"STC_PL_HERE_DELIM", SWIG_FromInt((int)22));
-    PyDict_SetItemString(d,"STC_PL_HERE_Q", SWIG_FromInt((int)23));
-    PyDict_SetItemString(d,"STC_PL_HERE_QQ", SWIG_FromInt((int)24));
-    PyDict_SetItemString(d,"STC_PL_HERE_QX", SWIG_FromInt((int)25));
-    PyDict_SetItemString(d,"STC_PL_STRING_Q", SWIG_FromInt((int)26));
-    PyDict_SetItemString(d,"STC_PL_STRING_QQ", SWIG_FromInt((int)27));
-    PyDict_SetItemString(d,"STC_PL_STRING_QX", SWIG_FromInt((int)28));
-    PyDict_SetItemString(d,"STC_PL_STRING_QR", SWIG_FromInt((int)29));
-    PyDict_SetItemString(d,"STC_PL_STRING_QW", SWIG_FromInt((int)30));
-    PyDict_SetItemString(d,"STC_B_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_B_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_B_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_B_KEYWORD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_B_STRING", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_B_PREPROCESSOR", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_B_OPERATOR", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_B_IDENTIFIER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_B_DATE", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_B_STRINGEOL", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_B_KEYWORD2", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_B_KEYWORD3", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_B_KEYWORD4", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_PROPS_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_PROPS_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_PROPS_SECTION", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_PROPS_ASSIGNMENT", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_PROPS_DEFVAL", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_L_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_L_COMMAND", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_L_TAG", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_L_MATH", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_L_COMMENT", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_LUA_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_LUA_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_LUA_COMMENTLINE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_LUA_COMMENTDOC", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_LUA_NUMBER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_LUA_WORD", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_LUA_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_LUA_CHARACTER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_LUA_LITERALSTRING", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_LUA_PREPROCESSOR", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_LUA_OPERATOR", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_LUA_IDENTIFIER", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_LUA_STRINGEOL", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_LUA_WORD2", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_LUA_WORD3", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_LUA_WORD4", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_LUA_WORD5", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_LUA_WORD6", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_LUA_WORD7", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_LUA_WORD8", SWIG_FromInt((int)19));
-    PyDict_SetItemString(d,"STC_ERR_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_ERR_PYTHON", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_ERR_GCC", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_ERR_MS", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_ERR_CMD", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_ERR_BORLAND", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_ERR_PERL", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_ERR_NET", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_ERR_LUA", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_ERR_CTAG", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_ERR_DIFF_CHANGED", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_ERR_DIFF_ADDITION", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_ERR_DIFF_DELETION", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_ERR_DIFF_MESSAGE", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_ERR_PHP", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_ERR_ELF", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_ERR_IFC", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_ERR_IFORT", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_ERR_ABSF", SWIG_FromInt((int)18));
-    PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_BAT_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_BAT_WORD", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_BAT_LABEL", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_BAT_HIDE", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_BAT_COMMAND", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_BAT_IDENTIFIER", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_BAT_OPERATOR", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_MAKE_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_MAKE_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_MAKE_PREPROCESSOR", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_MAKE_IDENTIFIER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_MAKE_OPERATOR", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_MAKE_TARGET", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_MAKE_IDEOL", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_DIFF_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_DIFF_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_DIFF_COMMAND", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_DIFF_HEADER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_DIFF_POSITION", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_DIFF_DELETED", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_DIFF_ADDED", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_CONF_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_CONF_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CONF_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CONF_IDENTIFIER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_CONF_EXTENSION", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_CONF_PARAMETER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_CONF_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_CONF_OPERATOR", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_CONF_IP", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_CONF_DIRECTIVE", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_AVE_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_AVE_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_AVE_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_AVE_WORD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_AVE_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_AVE_ENUM", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_AVE_STRINGEOL", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_AVE_IDENTIFIER", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_AVE_OPERATOR", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_AVE_WORD1", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_AVE_WORD2", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_AVE_WORD3", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_AVE_WORD4", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_AVE_WORD5", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_AVE_WORD6", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_ADA_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_ADA_WORD", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_ADA_IDENTIFIER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_ADA_NUMBER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_ADA_DELIMITER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_ADA_CHARACTER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_ADA_CHARACTEREOL", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_ADA_STRING", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_ADA_STRINGEOL", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_ADA_LABEL", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_ADA_COMMENTLINE", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_ADA_ILLEGAL", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_BAAN_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_BAAN_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_BAAN_COMMENTDOC", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_BAAN_NUMBER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_BAAN_WORD", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_BAAN_STRING", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_BAAN_PREPROCESSOR", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_BAAN_OPERATOR", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_BAAN_IDENTIFIER", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_BAAN_STRINGEOL", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_BAAN_WORD2", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_LISP_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_LISP_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_LISP_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_LISP_KEYWORD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_LISP_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_LISP_STRINGEOL", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_LISP_IDENTIFIER", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_LISP_OPERATOR", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_EIFFEL_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_EIFFEL_COMMENTLINE", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_EIFFEL_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_EIFFEL_WORD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_EIFFEL_STRING", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_EIFFEL_CHARACTER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_EIFFEL_OPERATOR", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_EIFFEL_IDENTIFIER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_EIFFEL_STRINGEOL", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_TASK", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_SECTION", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_KEYWORD", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_MODIFIER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_ASTERISK", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_NUMBER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_STRING", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_ENVIRONMENT", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_NNCRONTAB_IDENTIFIER", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_FORTH_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_FORTH_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_FORTH_COMMENT_ML", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_FORTH_IDENTIFIER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_FORTH_CONTROL", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_FORTH_KEYWORD", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_FORTH_DEFWORD", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_FORTH_PREWORD1", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_FORTH_PREWORD2", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_FORTH_NUMBER", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_FORTH_STRING", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_FORTH_LOCALE", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_MATLAB_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_MATLAB_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_MATLAB_COMMAND", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_MATLAB_NUMBER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_MATLAB_KEYWORD", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_MATLAB_STRING", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_MATLAB_OPERATOR", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_MATLAB_IDENTIFIER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_MATLAB_DOUBLEQUOTESTRING", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_WHITE", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_COMMENTLINE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_PERSISTENT", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_CSTYLE", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_COMMENTBLOCK", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_NUMBER", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_STRING", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_CHARACTER", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_STRINGEOL", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_KEYWORD", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_OPERATOR", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_IDENTIFIER", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_TRIPLE", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_CLASSNAME", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_SCRIPTOL_PREPROCESSOR", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_ASM_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_ASM_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_ASM_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_ASM_STRING", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_ASM_OPERATOR", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_ASM_IDENTIFIER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_ASM_CPUINSTRUCTION", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_ASM_MATHINSTRUCTION", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_ASM_REGISTER", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_ASM_DIRECTIVE", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_ASM_DIRECTIVEOPERAND", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_ASM_COMMENTBLOCK", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_ASM_CHARACTER", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_ASM_STRINGEOL", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_ASM_EXTINSTRUCTION", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_F_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_F_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_F_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_F_STRING1", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_F_STRING2", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_F_STRINGEOL", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_F_OPERATOR", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_F_IDENTIFIER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_F_WORD", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_F_WORD2", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_F_WORD3", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_F_PREPROCESSOR", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_F_OPERATOR2", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_F_LABEL", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_F_CONTINUATION", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_CSS_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_CSS_TAG", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CSS_CLASS", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CSS_PSEUDOCLASS", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_CSS_UNKNOWN_PSEUDOCLASS", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_CSS_OPERATOR", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_CSS_IDENTIFIER", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_CSS_UNKNOWN_IDENTIFIER", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_CSS_VALUE", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_CSS_COMMENT", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_CSS_ID", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_CSS_IMPORTANT", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_CSS_DIRECTIVE", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_CSS_DOUBLESTRING", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_CSS_SINGLESTRING", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_POV_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_POV_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_POV_COMMENTLINE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_POV_NUMBER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_POV_OPERATOR", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_POV_IDENTIFIER", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_POV_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_POV_STRINGEOL", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_POV_DIRECTIVE", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_POV_BADDIRECTIVE", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_POV_WORD2", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_POV_WORD3", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_POV_WORD4", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_POV_WORD5", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_POV_WORD6", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_POV_WORD7", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_POV_WORD8", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_LOUT_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_LOUT_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_LOUT_NUMBER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_LOUT_WORD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_LOUT_WORD2", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_LOUT_WORD3", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_LOUT_WORD4", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_LOUT_STRING", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_LOUT_OPERATOR", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_LOUT_IDENTIFIER", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_LOUT_STRINGEOL", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_ESCRIPT_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_ESCRIPT_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_ESCRIPT_COMMENTLINE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_ESCRIPT_COMMENTDOC", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_ESCRIPT_NUMBER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_ESCRIPT_WORD", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_ESCRIPT_STRING", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_ESCRIPT_OPERATOR", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_ESCRIPT_IDENTIFIER", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_ESCRIPT_BRACE", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_ESCRIPT_WORD2", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_ESCRIPT_WORD3", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_PS_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_PS_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_PS_DSC_COMMENT", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_PS_DSC_VALUE", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_PS_NUMBER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_PS_NAME", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_PS_KEYWORD", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_PS_LITERAL", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_PS_IMMEVAL", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_PS_PAREN_ARRAY", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_PS_PAREN_DICT", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_PS_PAREN_PROC", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_PS_TEXT", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_PS_HEXSTRING", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_PS_BASE85STRING", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_PS_BADSTRINGCHAR", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_NSIS_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_NSIS_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_NSIS_STRINGDQ", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_NSIS_STRINGLQ", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_NSIS_STRINGRQ", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_NSIS_FUNCTION", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_NSIS_VARIABLE", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_NSIS_LABEL", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_NSIS_USERDEFINED", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_NSIS_SECTIONDEF", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_NSIS_SUBSECTIONDEF", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_NSIS_IFDEFINEDEF", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_NSIS_MACRODEF", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_NSIS_STRINGVAR", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_MMIXAL_LEADWS", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_MMIXAL_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_MMIXAL_LABEL", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_PRE", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_VALID", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_UNKNOWN", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_POST", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPERANDS", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_MMIXAL_NUMBER", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_MMIXAL_REF", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_MMIXAL_CHAR", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_MMIXAL_STRING", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_MMIXAL_REGISTER", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_MMIXAL_HEX", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_MMIXAL_OPERATOR", SWIG_FromInt((int)15));
-    PyDict_SetItemString(d,"STC_MMIXAL_SYMBOL", SWIG_FromInt((int)16));
-    PyDict_SetItemString(d,"STC_MMIXAL_INCLUDE", SWIG_FromInt((int)17));
-    PyDict_SetItemString(d,"STC_CLW_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_CLW_LABEL", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_CLW_COMMENT", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_CLW_STRING", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_CLW_USER_IDENTIFIER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_CLW_INTEGER_CONSTANT", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_CLW_REAL_CONSTANT", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_CLW_PICTURE_STRING", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_CLW_KEYWORD", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_CLW_COMPILER_DIRECTIVE", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_CLW_BUILTIN_PROCEDURES_FUNCTION", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_CLW_STRUCTURE_DATA_TYPE", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_CLW_ATTRIBUTE", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_CLW_STANDARD_EQUATE", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_CLW_ERROR", SWIG_FromInt((int)14));
-    PyDict_SetItemString(d,"STC_LOT_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_LOT_HEADER", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_LOT_BREAK", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_LOT_SET", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_LOT_PASS", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_LOT_FAIL", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_LOT_ABORT", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_YAML_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_YAML_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_YAML_IDENTIFIER", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_YAML_KEYWORD", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_YAML_NUMBER", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_YAML_REFERENCE", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_YAML_DOCUMENT", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_YAML_TEXT", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_YAML_ERROR", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_TEX_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_TEX_SPECIAL", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_TEX_GROUP", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_TEX_SYMBOL", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_TEX_COMMAND", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_TEX_TEXT", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_METAPOST_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_METAPOST_SPECIAL", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_METAPOST_GROUP", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_METAPOST_SYMBOL", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_METAPOST_COMMAND", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_METAPOST_TEXT", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_METAPOST_EXTRA", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_ERLANG_DEFAULT", SWIG_FromInt((int)0));
-    PyDict_SetItemString(d,"STC_ERLANG_COMMENT", SWIG_FromInt((int)1));
-    PyDict_SetItemString(d,"STC_ERLANG_VARIABLE", SWIG_FromInt((int)2));
-    PyDict_SetItemString(d,"STC_ERLANG_NUMBER", SWIG_FromInt((int)3));
-    PyDict_SetItemString(d,"STC_ERLANG_KEYWORD", SWIG_FromInt((int)4));
-    PyDict_SetItemString(d,"STC_ERLANG_STRING", SWIG_FromInt((int)5));
-    PyDict_SetItemString(d,"STC_ERLANG_OPERATOR", SWIG_FromInt((int)6));
-    PyDict_SetItemString(d,"STC_ERLANG_ATOM", SWIG_FromInt((int)7));
-    PyDict_SetItemString(d,"STC_ERLANG_FUNCTION_NAME", SWIG_FromInt((int)8));
-    PyDict_SetItemString(d,"STC_ERLANG_CHARACTER", SWIG_FromInt((int)9));
-    PyDict_SetItemString(d,"STC_ERLANG_MACRO", SWIG_FromInt((int)10));
-    PyDict_SetItemString(d,"STC_ERLANG_RECORD", SWIG_FromInt((int)11));
-    PyDict_SetItemString(d,"STC_ERLANG_SEPARATOR", SWIG_FromInt((int)12));
-    PyDict_SetItemString(d,"STC_ERLANG_NODE_NAME", SWIG_FromInt((int)13));
-    PyDict_SetItemString(d,"STC_ERLANG_UNKNOWN", SWIG_FromInt((int)31));
-    PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_FromInt((int)2011));
-    PyDict_SetItemString(d,"STC_CMD_SELECTALL", SWIG_FromInt((int)2013));
-    PyDict_SetItemString(d,"STC_CMD_UNDO", SWIG_FromInt((int)2176));
-    PyDict_SetItemString(d,"STC_CMD_CUT", SWIG_FromInt((int)2177));
-    PyDict_SetItemString(d,"STC_CMD_COPY", SWIG_FromInt((int)2178));
-    PyDict_SetItemString(d,"STC_CMD_PASTE", SWIG_FromInt((int)2179));
-    PyDict_SetItemString(d,"STC_CMD_CLEAR", SWIG_FromInt((int)2180));
-    PyDict_SetItemString(d,"STC_CMD_LINEDOWN", SWIG_FromInt((int)2300));
-    PyDict_SetItemString(d,"STC_CMD_LINEDOWNEXTEND", SWIG_FromInt((int)2301));
-    PyDict_SetItemString(d,"STC_CMD_LINEUP", SWIG_FromInt((int)2302));
-    PyDict_SetItemString(d,"STC_CMD_LINEUPEXTEND", SWIG_FromInt((int)2303));
-    PyDict_SetItemString(d,"STC_CMD_CHARLEFT", SWIG_FromInt((int)2304));
-    PyDict_SetItemString(d,"STC_CMD_CHARLEFTEXTEND", SWIG_FromInt((int)2305));
-    PyDict_SetItemString(d,"STC_CMD_CHARRIGHT", SWIG_FromInt((int)2306));
-    PyDict_SetItemString(d,"STC_CMD_CHARRIGHTEXTEND", SWIG_FromInt((int)2307));
-    PyDict_SetItemString(d,"STC_CMD_WORDLEFT", SWIG_FromInt((int)2308));
-    PyDict_SetItemString(d,"STC_CMD_WORDLEFTEXTEND", SWIG_FromInt((int)2309));
-    PyDict_SetItemString(d,"STC_CMD_WORDRIGHT", SWIG_FromInt((int)2310));
-    PyDict_SetItemString(d,"STC_CMD_WORDRIGHTEXTEND", SWIG_FromInt((int)2311));
-    PyDict_SetItemString(d,"STC_CMD_HOME", SWIG_FromInt((int)2312));
-    PyDict_SetItemString(d,"STC_CMD_HOMEEXTEND", SWIG_FromInt((int)2313));
-    PyDict_SetItemString(d,"STC_CMD_LINEEND", SWIG_FromInt((int)2314));
-    PyDict_SetItemString(d,"STC_CMD_LINEENDEXTEND", SWIG_FromInt((int)2315));
-    PyDict_SetItemString(d,"STC_CMD_DOCUMENTSTART", SWIG_FromInt((int)2316));
-    PyDict_SetItemString(d,"STC_CMD_DOCUMENTSTARTEXTEND", SWIG_FromInt((int)2317));
-    PyDict_SetItemString(d,"STC_CMD_DOCUMENTEND", SWIG_FromInt((int)2318));
-    PyDict_SetItemString(d,"STC_CMD_DOCUMENTENDEXTEND", SWIG_FromInt((int)2319));
-    PyDict_SetItemString(d,"STC_CMD_PAGEUP", SWIG_FromInt((int)2320));
-    PyDict_SetItemString(d,"STC_CMD_PAGEUPEXTEND", SWIG_FromInt((int)2321));
-    PyDict_SetItemString(d,"STC_CMD_PAGEDOWN", SWIG_FromInt((int)2322));
-    PyDict_SetItemString(d,"STC_CMD_PAGEDOWNEXTEND", SWIG_FromInt((int)2323));
-    PyDict_SetItemString(d,"STC_CMD_EDITTOGGLEOVERTYPE", SWIG_FromInt((int)2324));
-    PyDict_SetItemString(d,"STC_CMD_CANCEL", SWIG_FromInt((int)2325));
-    PyDict_SetItemString(d,"STC_CMD_DELETEBACK", SWIG_FromInt((int)2326));
-    PyDict_SetItemString(d,"STC_CMD_TAB", SWIG_FromInt((int)2327));
-    PyDict_SetItemString(d,"STC_CMD_BACKTAB", SWIG_FromInt((int)2328));
-    PyDict_SetItemString(d,"STC_CMD_NEWLINE", SWIG_FromInt((int)2329));
-    PyDict_SetItemString(d,"STC_CMD_FORMFEED", SWIG_FromInt((int)2330));
-    PyDict_SetItemString(d,"STC_CMD_VCHOME", SWIG_FromInt((int)2331));
-    PyDict_SetItemString(d,"STC_CMD_VCHOMEEXTEND", SWIG_FromInt((int)2332));
-    PyDict_SetItemString(d,"STC_CMD_ZOOMIN", SWIG_FromInt((int)2333));
-    PyDict_SetItemString(d,"STC_CMD_ZOOMOUT", SWIG_FromInt((int)2334));
-    PyDict_SetItemString(d,"STC_CMD_DELWORDLEFT", SWIG_FromInt((int)2335));
-    PyDict_SetItemString(d,"STC_CMD_DELWORDRIGHT", SWIG_FromInt((int)2336));
-    PyDict_SetItemString(d,"STC_CMD_LINECUT", SWIG_FromInt((int)2337));
-    PyDict_SetItemString(d,"STC_CMD_LINEDELETE", SWIG_FromInt((int)2338));
-    PyDict_SetItemString(d,"STC_CMD_LINETRANSPOSE", SWIG_FromInt((int)2339));
-    PyDict_SetItemString(d,"STC_CMD_LINEDUPLICATE", SWIG_FromInt((int)2404));
-    PyDict_SetItemString(d,"STC_CMD_LOWERCASE", SWIG_FromInt((int)2340));
-    PyDict_SetItemString(d,"STC_CMD_UPPERCASE", SWIG_FromInt((int)2341));
-    PyDict_SetItemString(d,"STC_CMD_LINESCROLLDOWN", SWIG_FromInt((int)2342));
-    PyDict_SetItemString(d,"STC_CMD_LINESCROLLUP", SWIG_FromInt((int)2343));
-    PyDict_SetItemString(d,"STC_CMD_DELETEBACKNOTLINE", SWIG_FromInt((int)2344));
-    PyDict_SetItemString(d,"STC_CMD_HOMEDISPLAY", SWIG_FromInt((int)2345));
-    PyDict_SetItemString(d,"STC_CMD_HOMEDISPLAYEXTEND", SWIG_FromInt((int)2346));
-    PyDict_SetItemString(d,"STC_CMD_LINEENDDISPLAY", SWIG_FromInt((int)2347));
-    PyDict_SetItemString(d,"STC_CMD_LINEENDDISPLAYEXTEND", SWIG_FromInt((int)2348));
-    PyDict_SetItemString(d,"STC_CMD_HOMEWRAP", SWIG_FromInt((int)2349));
-    PyDict_SetItemString(d,"STC_CMD_HOMEWRAPEXTEND", SWIG_FromInt((int)2450));
-    PyDict_SetItemString(d,"STC_CMD_LINEENDWRAP", SWIG_FromInt((int)2451));
-    PyDict_SetItemString(d,"STC_CMD_LINEENDWRAPEXTEND", SWIG_FromInt((int)2452));
-    PyDict_SetItemString(d,"STC_CMD_VCHOMEWRAP", SWIG_FromInt((int)2453));
-    PyDict_SetItemString(d,"STC_CMD_VCHOMEWRAPEXTEND", SWIG_FromInt((int)2454));
-    PyDict_SetItemString(d,"STC_CMD_LINECOPY", SWIG_FromInt((int)2455));
-    PyDict_SetItemString(d,"STC_CMD_WORDPARTLEFT", SWIG_FromInt((int)2390));
-    PyDict_SetItemString(d,"STC_CMD_WORDPARTLEFTEXTEND", SWIG_FromInt((int)2391));
-    PyDict_SetItemString(d,"STC_CMD_WORDPARTRIGHT", SWIG_FromInt((int)2392));
-    PyDict_SetItemString(d,"STC_CMD_WORDPARTRIGHTEXTEND", SWIG_FromInt((int)2393));
-    PyDict_SetItemString(d,"STC_CMD_DELLINELEFT", SWIG_FromInt((int)2395));
-    PyDict_SetItemString(d,"STC_CMD_DELLINERIGHT", SWIG_FromInt((int)2396));
-    PyDict_SetItemString(d,"STC_CMD_PARADOWN", SWIG_FromInt((int)2413));
-    PyDict_SetItemString(d,"STC_CMD_PARADOWNEXTEND", SWIG_FromInt((int)2414));
-    PyDict_SetItemString(d,"STC_CMD_PARAUP", SWIG_FromInt((int)2415));
-    PyDict_SetItemString(d,"STC_CMD_PARAUPEXTEND", SWIG_FromInt((int)2416));
-    PyDict_SetItemString(d,"STC_CMD_LINEDOWNRECTEXTEND", SWIG_FromInt((int)2426));
-    PyDict_SetItemString(d,"STC_CMD_LINEUPRECTEXTEND", SWIG_FromInt((int)2427));
-    PyDict_SetItemString(d,"STC_CMD_CHARLEFTRECTEXTEND", SWIG_FromInt((int)2428));
-    PyDict_SetItemString(d,"STC_CMD_CHARRIGHTRECTEXTEND", SWIG_FromInt((int)2429));
-    PyDict_SetItemString(d,"STC_CMD_HOMERECTEXTEND", SWIG_FromInt((int)2430));
-    PyDict_SetItemString(d,"STC_CMD_VCHOMERECTEXTEND", SWIG_FromInt((int)2431));
-    PyDict_SetItemString(d,"STC_CMD_LINEENDRECTEXTEND", SWIG_FromInt((int)2432));
-    PyDict_SetItemString(d,"STC_CMD_PAGEUPRECTEXTEND", SWIG_FromInt((int)2433));
-    PyDict_SetItemString(d,"STC_CMD_PAGEDOWNRECTEXTEND", SWIG_FromInt((int)2434));
-    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEUP", SWIG_FromInt((int)2435));
-    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEUPEXTEND", SWIG_FromInt((int)2436));
-    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEDOWN", SWIG_FromInt((int)2437));
-    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEDOWNEXTEND", SWIG_FromInt((int)2438));
-    PyDict_SetItemString(d,"STC_CMD_WORDLEFTEND", SWIG_FromInt((int)2439));
-    PyDict_SetItemString(d,"STC_CMD_WORDLEFTENDEXTEND", SWIG_FromInt((int)2440));
-    PyDict_SetItemString(d,"STC_CMD_WORDRIGHTEND", SWIG_FromInt((int)2441));
-    PyDict_SetItemString(d,"STC_CMD_WORDRIGHTENDEXTEND", SWIG_FromInt((int)2442));
-    PyDict_SetItemString(d,"wxEVT_STC_CHANGE", SWIG_FromInt((int)wxEVT_STC_CHANGE));
-    PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", SWIG_FromInt((int)wxEVT_STC_STYLENEEDED));
-    PyDict_SetItemString(d,"wxEVT_STC_CHARADDED", SWIG_FromInt((int)wxEVT_STC_CHARADDED));
-    PyDict_SetItemString(d,"wxEVT_STC_SAVEPOINTREACHED", SWIG_FromInt((int)wxEVT_STC_SAVEPOINTREACHED));
-    PyDict_SetItemString(d,"wxEVT_STC_SAVEPOINTLEFT", SWIG_FromInt((int)wxEVT_STC_SAVEPOINTLEFT));
-    PyDict_SetItemString(d,"wxEVT_STC_ROMODIFYATTEMPT", SWIG_FromInt((int)wxEVT_STC_ROMODIFYATTEMPT));
-    PyDict_SetItemString(d,"wxEVT_STC_KEY", SWIG_FromInt((int)wxEVT_STC_KEY));
-    PyDict_SetItemString(d,"wxEVT_STC_DOUBLECLICK", SWIG_FromInt((int)wxEVT_STC_DOUBLECLICK));
-    PyDict_SetItemString(d,"wxEVT_STC_UPDATEUI", SWIG_FromInt((int)wxEVT_STC_UPDATEUI));
-    PyDict_SetItemString(d,"wxEVT_STC_MODIFIED", SWIG_FromInt((int)wxEVT_STC_MODIFIED));
-    PyDict_SetItemString(d,"wxEVT_STC_MACRORECORD", SWIG_FromInt((int)wxEVT_STC_MACRORECORD));
-    PyDict_SetItemString(d,"wxEVT_STC_MARGINCLICK", SWIG_FromInt((int)wxEVT_STC_MARGINCLICK));
-    PyDict_SetItemString(d,"wxEVT_STC_NEEDSHOWN", SWIG_FromInt((int)wxEVT_STC_NEEDSHOWN));
-    PyDict_SetItemString(d,"wxEVT_STC_PAINTED", SWIG_FromInt((int)wxEVT_STC_PAINTED));
-    PyDict_SetItemString(d,"wxEVT_STC_USERLISTSELECTION", SWIG_FromInt((int)wxEVT_STC_USERLISTSELECTION));
-    PyDict_SetItemString(d,"wxEVT_STC_URIDROPPED", SWIG_FromInt((int)wxEVT_STC_URIDROPPED));
-    PyDict_SetItemString(d,"wxEVT_STC_DWELLSTART", SWIG_FromInt((int)wxEVT_STC_DWELLSTART));
-    PyDict_SetItemString(d,"wxEVT_STC_DWELLEND", SWIG_FromInt((int)wxEVT_STC_DWELLEND));
-    PyDict_SetItemString(d,"wxEVT_STC_START_DRAG", SWIG_FromInt((int)wxEVT_STC_START_DRAG));
-    PyDict_SetItemString(d,"wxEVT_STC_DRAG_OVER", SWIG_FromInt((int)wxEVT_STC_DRAG_OVER));
-    PyDict_SetItemString(d,"wxEVT_STC_DO_DROP", SWIG_FromInt((int)wxEVT_STC_DO_DROP));
-    PyDict_SetItemString(d,"wxEVT_STC_ZOOM", SWIG_FromInt((int)wxEVT_STC_ZOOM));
-    PyDict_SetItemString(d,"wxEVT_STC_HOTSPOT_CLICK", SWIG_FromInt((int)wxEVT_STC_HOTSPOT_CLICK));
-    PyDict_SetItemString(d,"wxEVT_STC_HOTSPOT_DCLICK", SWIG_FromInt((int)wxEVT_STC_HOTSPOT_DCLICK));
-    PyDict_SetItemString(d,"wxEVT_STC_CALLTIP_CLICK", SWIG_FromInt((int)wxEVT_STC_CALLTIP_CLICK));
+    PyDict_SetItemString(d,"STC_USE_DND", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_USE_POPUP", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_INVALID_POSITION", SWIG_From_int((int)-1));
+    PyDict_SetItemString(d,"STC_START", SWIG_From_int((int)2000));
+    PyDict_SetItemString(d,"STC_OPTIONAL_START", SWIG_From_int((int)3000));
+    PyDict_SetItemString(d,"STC_LEXER_START", SWIG_From_int((int)4000));
+    PyDict_SetItemString(d,"STC_WS_INVISIBLE", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_WS_VISIBLEALWAYS", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_WS_VISIBLEAFTERINDENT", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_EOL_CRLF", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_EOL_CR", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_EOL_LF", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CP_UTF8", SWIG_From_int((int)65001));
+    PyDict_SetItemString(d,"STC_CP_DBCS", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_MARKER_MAX", SWIG_From_int((int)31));
+    PyDict_SetItemString(d,"STC_MARK_CIRCLE", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_MARK_ROUNDRECT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_MARK_ARROW", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_MARK_SMALLRECT", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_MARK_SHORTARROW", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_MARK_EMPTY", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_MARK_ARROWDOWN", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_MARK_MINUS", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_MARK_PLUS", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_MARK_VLINE", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_MARK_LCORNER", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_MARK_TCORNER", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_MARK_BOXPLUS", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_MARK_BOXPLUSCONNECTED", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_MARK_BOXMINUS", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_MARK_BOXMINUSCONNECTED", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_MARK_LCORNERCURVE", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_MARK_TCORNERCURVE", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_MARK_CIRCLEPLUS", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_MARK_CIRCLEPLUSCONNECTED", SWIG_From_int((int)19));
+    PyDict_SetItemString(d,"STC_MARK_CIRCLEMINUS", SWIG_From_int((int)20));
+    PyDict_SetItemString(d,"STC_MARK_CIRCLEMINUSCONNECTED", SWIG_From_int((int)21));
+    PyDict_SetItemString(d,"STC_MARK_BACKGROUND", SWIG_From_int((int)22));
+    PyDict_SetItemString(d,"STC_MARK_DOTDOTDOT", SWIG_From_int((int)23));
+    PyDict_SetItemString(d,"STC_MARK_ARROWS", SWIG_From_int((int)24));
+    PyDict_SetItemString(d,"STC_MARK_PIXMAP", SWIG_From_int((int)25));
+    PyDict_SetItemString(d,"STC_MARK_CHARACTER", SWIG_From_int((int)10000));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDEREND", SWIG_From_int((int)25));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDEROPENMID", SWIG_From_int((int)26));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDERMIDTAIL", SWIG_From_int((int)27));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDERTAIL", SWIG_From_int((int)28));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDERSUB", SWIG_From_int((int)29));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDER", SWIG_From_int((int)30));
+    PyDict_SetItemString(d,"STC_MARKNUM_FOLDEROPEN", SWIG_From_int((int)31));
+    PyDict_SetItemString(d,"STC_MASK_FOLDERS", SWIG_From_int((int)0xFE000000));
+    PyDict_SetItemString(d,"STC_MARGIN_SYMBOL", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_MARGIN_NUMBER", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_STYLE_DEFAULT", SWIG_From_int((int)32));
+    PyDict_SetItemString(d,"STC_STYLE_LINENUMBER", SWIG_From_int((int)33));
+    PyDict_SetItemString(d,"STC_STYLE_BRACELIGHT", SWIG_From_int((int)34));
+    PyDict_SetItemString(d,"STC_STYLE_BRACEBAD", SWIG_From_int((int)35));
+    PyDict_SetItemString(d,"STC_STYLE_CONTROLCHAR", SWIG_From_int((int)36));
+    PyDict_SetItemString(d,"STC_STYLE_INDENTGUIDE", SWIG_From_int((int)37));
+    PyDict_SetItemString(d,"STC_STYLE_LASTPREDEFINED", SWIG_From_int((int)39));
+    PyDict_SetItemString(d,"STC_STYLE_MAX", SWIG_From_int((int)127));
+    PyDict_SetItemString(d,"STC_CHARSET_ANSI", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_CHARSET_DEFAULT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CHARSET_BALTIC", SWIG_From_int((int)186));
+    PyDict_SetItemString(d,"STC_CHARSET_CHINESEBIG5", SWIG_From_int((int)136));
+    PyDict_SetItemString(d,"STC_CHARSET_EASTEUROPE", SWIG_From_int((int)238));
+    PyDict_SetItemString(d,"STC_CHARSET_GB2312", SWIG_From_int((int)134));
+    PyDict_SetItemString(d,"STC_CHARSET_GREEK", SWIG_From_int((int)161));
+    PyDict_SetItemString(d,"STC_CHARSET_HANGUL", SWIG_From_int((int)129));
+    PyDict_SetItemString(d,"STC_CHARSET_MAC", SWIG_From_int((int)77));
+    PyDict_SetItemString(d,"STC_CHARSET_OEM", SWIG_From_int((int)255));
+    PyDict_SetItemString(d,"STC_CHARSET_RUSSIAN", SWIG_From_int((int)204));
+    PyDict_SetItemString(d,"STC_CHARSET_SHIFTJIS", SWIG_From_int((int)128));
+    PyDict_SetItemString(d,"STC_CHARSET_SYMBOL", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CHARSET_TURKISH", SWIG_From_int((int)162));
+    PyDict_SetItemString(d,"STC_CHARSET_JOHAB", SWIG_From_int((int)130));
+    PyDict_SetItemString(d,"STC_CHARSET_HEBREW", SWIG_From_int((int)177));
+    PyDict_SetItemString(d,"STC_CHARSET_ARABIC", SWIG_From_int((int)178));
+    PyDict_SetItemString(d,"STC_CHARSET_VIETNAMESE", SWIG_From_int((int)163));
+    PyDict_SetItemString(d,"STC_CHARSET_THAI", SWIG_From_int((int)222));
+    PyDict_SetItemString(d,"STC_CASE_MIXED", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_CASE_UPPER", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CASE_LOWER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_INDIC_MAX", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_INDIC_PLAIN", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_INDIC_SQUIGGLE", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_INDIC_TT", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_INDIC_DIAGONAL", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_INDIC_STRIKE", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_INDIC_HIDDEN", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_INDIC_BOX", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_INDIC0_MASK", SWIG_From_int((int)0x20));
+    PyDict_SetItemString(d,"STC_INDIC1_MASK", SWIG_From_int((int)0x40));
+    PyDict_SetItemString(d,"STC_INDIC2_MASK", SWIG_From_int((int)0x80));
+    PyDict_SetItemString(d,"STC_INDICS_MASK", SWIG_From_int((int)0xE0));
+    PyDict_SetItemString(d,"STC_PRINT_NORMAL", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_PRINT_INVERTLIGHT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_PRINT_BLACKONWHITE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_PRINT_COLOURONWHITE", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_PRINT_COLOURONWHITEDEFAULTBG", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_FIND_WHOLEWORD", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_FIND_MATCHCASE", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_FIND_WORDSTART", SWIG_From_int((int)0x00100000));
+    PyDict_SetItemString(d,"STC_FIND_REGEXP", SWIG_From_int((int)0x00200000));
+    PyDict_SetItemString(d,"STC_FIND_POSIX", SWIG_From_int((int)0x00400000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELBASE", SWIG_From_int((int)0x400));
+    PyDict_SetItemString(d,"STC_FOLDLEVELWHITEFLAG", SWIG_From_int((int)0x1000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELHEADERFLAG", SWIG_From_int((int)0x2000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELBOXHEADERFLAG", SWIG_From_int((int)0x4000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELBOXFOOTERFLAG", SWIG_From_int((int)0x8000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELCONTRACTED", SWIG_From_int((int)0x10000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELUNINDENT", SWIG_From_int((int)0x20000));
+    PyDict_SetItemString(d,"STC_FOLDLEVELNUMBERMASK", SWIG_From_int((int)0x0FFF));
+    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEBEFORE_EXPANDED", SWIG_From_int((int)0x0002));
+    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEBEFORE_CONTRACTED", SWIG_From_int((int)0x0004));
+    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEAFTER_EXPANDED", SWIG_From_int((int)0x0008));
+    PyDict_SetItemString(d,"STC_FOLDFLAG_LINEAFTER_CONTRACTED", SWIG_From_int((int)0x0010));
+    PyDict_SetItemString(d,"STC_FOLDFLAG_LEVELNUMBERS", SWIG_From_int((int)0x0040));
+    PyDict_SetItemString(d,"STC_FOLDFLAG_BOX", SWIG_From_int((int)0x0001));
+    PyDict_SetItemString(d,"STC_TIME_FOREVER", SWIG_From_int((int)10000000));
+    PyDict_SetItemString(d,"STC_WRAP_NONE", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_WRAP_WORD", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CACHE_NONE", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_CACHE_CARET", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CACHE_PAGE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CACHE_DOCUMENT", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_EDGE_NONE", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_EDGE_LINE", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_EDGE_BACKGROUND", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CURSORNORMAL", SWIG_From_int((int)-1));
+    PyDict_SetItemString(d,"STC_CURSORWAIT", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_VISIBLE_SLOP", SWIG_From_int((int)0x01));
+    PyDict_SetItemString(d,"STC_VISIBLE_STRICT", SWIG_From_int((int)0x04));
+    PyDict_SetItemString(d,"STC_CARET_SLOP", SWIG_From_int((int)0x01));
+    PyDict_SetItemString(d,"STC_CARET_STRICT", SWIG_From_int((int)0x04));
+    PyDict_SetItemString(d,"STC_CARET_JUMPS", SWIG_From_int((int)0x10));
+    PyDict_SetItemString(d,"STC_CARET_EVEN", SWIG_From_int((int)0x08));
+    PyDict_SetItemString(d,"STC_SEL_STREAM", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_SEL_RECTANGLE", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_SEL_LINES", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_KEYWORDSET_MAX", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_MOD_INSERTTEXT", SWIG_From_int((int)0x1));
+    PyDict_SetItemString(d,"STC_MOD_DELETETEXT", SWIG_From_int((int)0x2));
+    PyDict_SetItemString(d,"STC_MOD_CHANGESTYLE", SWIG_From_int((int)0x4));
+    PyDict_SetItemString(d,"STC_MOD_CHANGEFOLD", SWIG_From_int((int)0x8));
+    PyDict_SetItemString(d,"STC_PERFORMED_USER", SWIG_From_int((int)0x10));
+    PyDict_SetItemString(d,"STC_PERFORMED_UNDO", SWIG_From_int((int)0x20));
+    PyDict_SetItemString(d,"STC_PERFORMED_REDO", SWIG_From_int((int)0x40));
+    PyDict_SetItemString(d,"STC_LASTSTEPINUNDOREDO", SWIG_From_int((int)0x100));
+    PyDict_SetItemString(d,"STC_MOD_CHANGEMARKER", SWIG_From_int((int)0x200));
+    PyDict_SetItemString(d,"STC_MOD_BEFOREINSERT", SWIG_From_int((int)0x400));
+    PyDict_SetItemString(d,"STC_MOD_BEFOREDELETE", SWIG_From_int((int)0x800));
+    PyDict_SetItemString(d,"STC_MODEVENTMASKALL", SWIG_From_int((int)0xF77));
+    PyDict_SetItemString(d,"STC_KEY_DOWN", SWIG_From_int((int)300));
+    PyDict_SetItemString(d,"STC_KEY_UP", SWIG_From_int((int)301));
+    PyDict_SetItemString(d,"STC_KEY_LEFT", SWIG_From_int((int)302));
+    PyDict_SetItemString(d,"STC_KEY_RIGHT", SWIG_From_int((int)303));
+    PyDict_SetItemString(d,"STC_KEY_HOME", SWIG_From_int((int)304));
+    PyDict_SetItemString(d,"STC_KEY_END", SWIG_From_int((int)305));
+    PyDict_SetItemString(d,"STC_KEY_PRIOR", SWIG_From_int((int)306));
+    PyDict_SetItemString(d,"STC_KEY_NEXT", SWIG_From_int((int)307));
+    PyDict_SetItemString(d,"STC_KEY_DELETE", SWIG_From_int((int)308));
+    PyDict_SetItemString(d,"STC_KEY_INSERT", SWIG_From_int((int)309));
+    PyDict_SetItemString(d,"STC_KEY_ESCAPE", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_KEY_BACK", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_KEY_TAB", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_KEY_RETURN", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_KEY_ADD", SWIG_From_int((int)310));
+    PyDict_SetItemString(d,"STC_KEY_SUBTRACT", SWIG_From_int((int)311));
+    PyDict_SetItemString(d,"STC_KEY_DIVIDE", SWIG_From_int((int)312));
+    PyDict_SetItemString(d,"STC_SCMOD_SHIFT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_SCMOD_CTRL", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_SCMOD_ALT", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_LEX_CONTAINER", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_LEX_NULL", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_LEX_PYTHON", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_LEX_CPP", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_LEX_HTML", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_LEX_XML", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_LEX_PERL", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_LEX_SQL", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_LEX_VB", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_LEX_PROPERTIES", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_LEX_ERRORLIST", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_LEX_MAKEFILE", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_LEX_BATCH", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_LEX_XCODE", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_LEX_LATEX", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_LEX_LUA", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_LEX_DIFF", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_LEX_CONF", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_LEX_PASCAL", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_LEX_AVE", SWIG_From_int((int)19));
+    PyDict_SetItemString(d,"STC_LEX_ADA", SWIG_From_int((int)20));
+    PyDict_SetItemString(d,"STC_LEX_LISP", SWIG_From_int((int)21));
+    PyDict_SetItemString(d,"STC_LEX_RUBY", SWIG_From_int((int)22));
+    PyDict_SetItemString(d,"STC_LEX_EIFFEL", SWIG_From_int((int)23));
+    PyDict_SetItemString(d,"STC_LEX_EIFFELKW", SWIG_From_int((int)24));
+    PyDict_SetItemString(d,"STC_LEX_TCL", SWIG_From_int((int)25));
+    PyDict_SetItemString(d,"STC_LEX_NNCRONTAB", SWIG_From_int((int)26));
+    PyDict_SetItemString(d,"STC_LEX_BULLANT", SWIG_From_int((int)27));
+    PyDict_SetItemString(d,"STC_LEX_VBSCRIPT", SWIG_From_int((int)28));
+    PyDict_SetItemString(d,"STC_LEX_ASP", SWIG_From_int((int)29));
+    PyDict_SetItemString(d,"STC_LEX_PHP", SWIG_From_int((int)30));
+    PyDict_SetItemString(d,"STC_LEX_BAAN", SWIG_From_int((int)31));
+    PyDict_SetItemString(d,"STC_LEX_MATLAB", SWIG_From_int((int)32));
+    PyDict_SetItemString(d,"STC_LEX_SCRIPTOL", SWIG_From_int((int)33));
+    PyDict_SetItemString(d,"STC_LEX_ASM", SWIG_From_int((int)34));
+    PyDict_SetItemString(d,"STC_LEX_CPPNOCASE", SWIG_From_int((int)35));
+    PyDict_SetItemString(d,"STC_LEX_FORTRAN", SWIG_From_int((int)36));
+    PyDict_SetItemString(d,"STC_LEX_F77", SWIG_From_int((int)37));
+    PyDict_SetItemString(d,"STC_LEX_CSS", SWIG_From_int((int)38));
+    PyDict_SetItemString(d,"STC_LEX_POV", SWIG_From_int((int)39));
+    PyDict_SetItemString(d,"STC_LEX_LOUT", SWIG_From_int((int)40));
+    PyDict_SetItemString(d,"STC_LEX_ESCRIPT", SWIG_From_int((int)41));
+    PyDict_SetItemString(d,"STC_LEX_PS", SWIG_From_int((int)42));
+    PyDict_SetItemString(d,"STC_LEX_NSIS", SWIG_From_int((int)43));
+    PyDict_SetItemString(d,"STC_LEX_MMIXAL", SWIG_From_int((int)44));
+    PyDict_SetItemString(d,"STC_LEX_CLW", SWIG_From_int((int)45));
+    PyDict_SetItemString(d,"STC_LEX_CLWNOCASE", SWIG_From_int((int)46));
+    PyDict_SetItemString(d,"STC_LEX_LOT", SWIG_From_int((int)47));
+    PyDict_SetItemString(d,"STC_LEX_YAML", SWIG_From_int((int)48));
+    PyDict_SetItemString(d,"STC_LEX_TEX", SWIG_From_int((int)49));
+    PyDict_SetItemString(d,"STC_LEX_METAPOST", SWIG_From_int((int)50));
+    PyDict_SetItemString(d,"STC_LEX_POWERBASIC", SWIG_From_int((int)51));
+    PyDict_SetItemString(d,"STC_LEX_FORTH", SWIG_From_int((int)52));
+    PyDict_SetItemString(d,"STC_LEX_ERLANG", SWIG_From_int((int)53));
+    PyDict_SetItemString(d,"STC_LEX_OCTAVE", SWIG_From_int((int)54));
+    PyDict_SetItemString(d,"STC_LEX_AUTOMATIC", SWIG_From_int((int)1000));
+    PyDict_SetItemString(d,"STC_P_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_P_COMMENTLINE", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_P_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_P_STRING", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_P_CHARACTER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_P_WORD", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_P_TRIPLE", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_P_TRIPLEDOUBLE", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_P_CLASSNAME", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_P_DEFNAME", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_P_OPERATOR", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_P_IDENTIFIER", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_P_COMMENTBLOCK", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_P_STRINGEOL", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_C_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_C_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_C_COMMENTLINE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_C_COMMENTDOC", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_C_NUMBER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_C_WORD", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_C_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_C_CHARACTER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_C_UUID", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_C_PREPROCESSOR", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_C_OPERATOR", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_C_IDENTIFIER", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_C_STRINGEOL", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_C_VERBATIM", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_C_REGEX", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_C_COMMENTLINEDOC", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_C_WORD2", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_C_COMMENTDOCKEYWORD", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_C_COMMENTDOCKEYWORDERROR", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_C_GLOBALCLASS", SWIG_From_int((int)19));
+    PyDict_SetItemString(d,"STC_H_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_H_TAG", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_H_TAGUNKNOWN", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_H_ATTRIBUTE", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_H_ATTRIBUTEUNKNOWN", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_H_NUMBER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_H_DOUBLESTRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_H_SINGLESTRING", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_H_OTHER", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_H_COMMENT", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_H_ENTITY", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_H_TAGEND", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_H_XMLSTART", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_H_XMLEND", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_H_SCRIPT", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_H_ASP", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_H_ASPAT", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_H_CDATA", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_H_QUESTION", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_H_VALUE", SWIG_From_int((int)19));
+    PyDict_SetItemString(d,"STC_H_XCCOMMENT", SWIG_From_int((int)20));
+    PyDict_SetItemString(d,"STC_H_SGML_DEFAULT", SWIG_From_int((int)21));
+    PyDict_SetItemString(d,"STC_H_SGML_COMMAND", SWIG_From_int((int)22));
+    PyDict_SetItemString(d,"STC_H_SGML_1ST_PARAM", SWIG_From_int((int)23));
+    PyDict_SetItemString(d,"STC_H_SGML_DOUBLESTRING", SWIG_From_int((int)24));
+    PyDict_SetItemString(d,"STC_H_SGML_SIMPLESTRING", SWIG_From_int((int)25));
+    PyDict_SetItemString(d,"STC_H_SGML_ERROR", SWIG_From_int((int)26));
+    PyDict_SetItemString(d,"STC_H_SGML_SPECIAL", SWIG_From_int((int)27));
+    PyDict_SetItemString(d,"STC_H_SGML_ENTITY", SWIG_From_int((int)28));
+    PyDict_SetItemString(d,"STC_H_SGML_COMMENT", SWIG_From_int((int)29));
+    PyDict_SetItemString(d,"STC_H_SGML_1ST_PARAM_COMMENT", SWIG_From_int((int)30));
+    PyDict_SetItemString(d,"STC_H_SGML_BLOCK_DEFAULT", SWIG_From_int((int)31));
+    PyDict_SetItemString(d,"STC_HJ_START", SWIG_From_int((int)40));
+    PyDict_SetItemString(d,"STC_HJ_DEFAULT", SWIG_From_int((int)41));
+    PyDict_SetItemString(d,"STC_HJ_COMMENT", SWIG_From_int((int)42));
+    PyDict_SetItemString(d,"STC_HJ_COMMENTLINE", SWIG_From_int((int)43));
+    PyDict_SetItemString(d,"STC_HJ_COMMENTDOC", SWIG_From_int((int)44));
+    PyDict_SetItemString(d,"STC_HJ_NUMBER", SWIG_From_int((int)45));
+    PyDict_SetItemString(d,"STC_HJ_WORD", SWIG_From_int((int)46));
+    PyDict_SetItemString(d,"STC_HJ_KEYWORD", SWIG_From_int((int)47));
+    PyDict_SetItemString(d,"STC_HJ_DOUBLESTRING", SWIG_From_int((int)48));
+    PyDict_SetItemString(d,"STC_HJ_SINGLESTRING", SWIG_From_int((int)49));
+    PyDict_SetItemString(d,"STC_HJ_SYMBOLS", SWIG_From_int((int)50));
+    PyDict_SetItemString(d,"STC_HJ_STRINGEOL", SWIG_From_int((int)51));
+    PyDict_SetItemString(d,"STC_HJ_REGEX", SWIG_From_int((int)52));
+    PyDict_SetItemString(d,"STC_HJA_START", SWIG_From_int((int)55));
+    PyDict_SetItemString(d,"STC_HJA_DEFAULT", SWIG_From_int((int)56));
+    PyDict_SetItemString(d,"STC_HJA_COMMENT", SWIG_From_int((int)57));
+    PyDict_SetItemString(d,"STC_HJA_COMMENTLINE", SWIG_From_int((int)58));
+    PyDict_SetItemString(d,"STC_HJA_COMMENTDOC", SWIG_From_int((int)59));
+    PyDict_SetItemString(d,"STC_HJA_NUMBER", SWIG_From_int((int)60));
+    PyDict_SetItemString(d,"STC_HJA_WORD", SWIG_From_int((int)61));
+    PyDict_SetItemString(d,"STC_HJA_KEYWORD", SWIG_From_int((int)62));
+    PyDict_SetItemString(d,"STC_HJA_DOUBLESTRING", SWIG_From_int((int)63));
+    PyDict_SetItemString(d,"STC_HJA_SINGLESTRING", SWIG_From_int((int)64));
+    PyDict_SetItemString(d,"STC_HJA_SYMBOLS", SWIG_From_int((int)65));
+    PyDict_SetItemString(d,"STC_HJA_STRINGEOL", SWIG_From_int((int)66));
+    PyDict_SetItemString(d,"STC_HJA_REGEX", SWIG_From_int((int)67));
+    PyDict_SetItemString(d,"STC_HB_START", SWIG_From_int((int)70));
+    PyDict_SetItemString(d,"STC_HB_DEFAULT", SWIG_From_int((int)71));
+    PyDict_SetItemString(d,"STC_HB_COMMENTLINE", SWIG_From_int((int)72));
+    PyDict_SetItemString(d,"STC_HB_NUMBER", SWIG_From_int((int)73));
+    PyDict_SetItemString(d,"STC_HB_WORD", SWIG_From_int((int)74));
+    PyDict_SetItemString(d,"STC_HB_STRING", SWIG_From_int((int)75));
+    PyDict_SetItemString(d,"STC_HB_IDENTIFIER", SWIG_From_int((int)76));
+    PyDict_SetItemString(d,"STC_HB_STRINGEOL", SWIG_From_int((int)77));
+    PyDict_SetItemString(d,"STC_HBA_START", SWIG_From_int((int)80));
+    PyDict_SetItemString(d,"STC_HBA_DEFAULT", SWIG_From_int((int)81));
+    PyDict_SetItemString(d,"STC_HBA_COMMENTLINE", SWIG_From_int((int)82));
+    PyDict_SetItemString(d,"STC_HBA_NUMBER", SWIG_From_int((int)83));
+    PyDict_SetItemString(d,"STC_HBA_WORD", SWIG_From_int((int)84));
+    PyDict_SetItemString(d,"STC_HBA_STRING", SWIG_From_int((int)85));
+    PyDict_SetItemString(d,"STC_HBA_IDENTIFIER", SWIG_From_int((int)86));
+    PyDict_SetItemString(d,"STC_HBA_STRINGEOL", SWIG_From_int((int)87));
+    PyDict_SetItemString(d,"STC_HP_START", SWIG_From_int((int)90));
+    PyDict_SetItemString(d,"STC_HP_DEFAULT", SWIG_From_int((int)91));
+    PyDict_SetItemString(d,"STC_HP_COMMENTLINE", SWIG_From_int((int)92));
+    PyDict_SetItemString(d,"STC_HP_NUMBER", SWIG_From_int((int)93));
+    PyDict_SetItemString(d,"STC_HP_STRING", SWIG_From_int((int)94));
+    PyDict_SetItemString(d,"STC_HP_CHARACTER", SWIG_From_int((int)95));
+    PyDict_SetItemString(d,"STC_HP_WORD", SWIG_From_int((int)96));
+    PyDict_SetItemString(d,"STC_HP_TRIPLE", SWIG_From_int((int)97));
+    PyDict_SetItemString(d,"STC_HP_TRIPLEDOUBLE", SWIG_From_int((int)98));
+    PyDict_SetItemString(d,"STC_HP_CLASSNAME", SWIG_From_int((int)99));
+    PyDict_SetItemString(d,"STC_HP_DEFNAME", SWIG_From_int((int)100));
+    PyDict_SetItemString(d,"STC_HP_OPERATOR", SWIG_From_int((int)101));
+    PyDict_SetItemString(d,"STC_HP_IDENTIFIER", SWIG_From_int((int)102));
+    PyDict_SetItemString(d,"STC_HPA_START", SWIG_From_int((int)105));
+    PyDict_SetItemString(d,"STC_HPA_DEFAULT", SWIG_From_int((int)106));
+    PyDict_SetItemString(d,"STC_HPA_COMMENTLINE", SWIG_From_int((int)107));
+    PyDict_SetItemString(d,"STC_HPA_NUMBER", SWIG_From_int((int)108));
+    PyDict_SetItemString(d,"STC_HPA_STRING", SWIG_From_int((int)109));
+    PyDict_SetItemString(d,"STC_HPA_CHARACTER", SWIG_From_int((int)110));
+    PyDict_SetItemString(d,"STC_HPA_WORD", SWIG_From_int((int)111));
+    PyDict_SetItemString(d,"STC_HPA_TRIPLE", SWIG_From_int((int)112));
+    PyDict_SetItemString(d,"STC_HPA_TRIPLEDOUBLE", SWIG_From_int((int)113));
+    PyDict_SetItemString(d,"STC_HPA_CLASSNAME", SWIG_From_int((int)114));
+    PyDict_SetItemString(d,"STC_HPA_DEFNAME", SWIG_From_int((int)115));
+    PyDict_SetItemString(d,"STC_HPA_OPERATOR", SWIG_From_int((int)116));
+    PyDict_SetItemString(d,"STC_HPA_IDENTIFIER", SWIG_From_int((int)117));
+    PyDict_SetItemString(d,"STC_HPHP_DEFAULT", SWIG_From_int((int)118));
+    PyDict_SetItemString(d,"STC_HPHP_HSTRING", SWIG_From_int((int)119));
+    PyDict_SetItemString(d,"STC_HPHP_SIMPLESTRING", SWIG_From_int((int)120));
+    PyDict_SetItemString(d,"STC_HPHP_WORD", SWIG_From_int((int)121));
+    PyDict_SetItemString(d,"STC_HPHP_NUMBER", SWIG_From_int((int)122));
+    PyDict_SetItemString(d,"STC_HPHP_VARIABLE", SWIG_From_int((int)123));
+    PyDict_SetItemString(d,"STC_HPHP_COMMENT", SWIG_From_int((int)124));
+    PyDict_SetItemString(d,"STC_HPHP_COMMENTLINE", SWIG_From_int((int)125));
+    PyDict_SetItemString(d,"STC_HPHP_HSTRING_VARIABLE", SWIG_From_int((int)126));
+    PyDict_SetItemString(d,"STC_HPHP_OPERATOR", SWIG_From_int((int)127));
+    PyDict_SetItemString(d,"STC_PL_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_PL_ERROR", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_PL_COMMENTLINE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_PL_POD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_PL_NUMBER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_PL_WORD", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_PL_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_PL_CHARACTER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_PL_PUNCTUATION", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_PL_PREPROCESSOR", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_PL_OPERATOR", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_PL_IDENTIFIER", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_PL_SCALAR", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_PL_ARRAY", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_PL_HASH", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_PL_SYMBOLTABLE", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_PL_REGEX", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_PL_REGSUBST", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_PL_LONGQUOTE", SWIG_From_int((int)19));
+    PyDict_SetItemString(d,"STC_PL_BACKTICKS", SWIG_From_int((int)20));
+    PyDict_SetItemString(d,"STC_PL_DATASECTION", SWIG_From_int((int)21));
+    PyDict_SetItemString(d,"STC_PL_HERE_DELIM", SWIG_From_int((int)22));
+    PyDict_SetItemString(d,"STC_PL_HERE_Q", SWIG_From_int((int)23));
+    PyDict_SetItemString(d,"STC_PL_HERE_QQ", SWIG_From_int((int)24));
+    PyDict_SetItemString(d,"STC_PL_HERE_QX", SWIG_From_int((int)25));
+    PyDict_SetItemString(d,"STC_PL_STRING_Q", SWIG_From_int((int)26));
+    PyDict_SetItemString(d,"STC_PL_STRING_QQ", SWIG_From_int((int)27));
+    PyDict_SetItemString(d,"STC_PL_STRING_QX", SWIG_From_int((int)28));
+    PyDict_SetItemString(d,"STC_PL_STRING_QR", SWIG_From_int((int)29));
+    PyDict_SetItemString(d,"STC_PL_STRING_QW", SWIG_From_int((int)30));
+    PyDict_SetItemString(d,"STC_B_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_B_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_B_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_B_KEYWORD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_B_STRING", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_B_PREPROCESSOR", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_B_OPERATOR", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_B_IDENTIFIER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_B_DATE", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_B_STRINGEOL", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_B_KEYWORD2", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_B_KEYWORD3", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_B_KEYWORD4", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_PROPS_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_PROPS_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_PROPS_SECTION", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_PROPS_ASSIGNMENT", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_PROPS_DEFVAL", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_L_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_L_COMMAND", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_L_TAG", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_L_MATH", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_L_COMMENT", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_LUA_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_LUA_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_LUA_COMMENTLINE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_LUA_COMMENTDOC", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_LUA_NUMBER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_LUA_WORD", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_LUA_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_LUA_CHARACTER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_LUA_LITERALSTRING", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_LUA_PREPROCESSOR", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_LUA_OPERATOR", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_LUA_IDENTIFIER", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_LUA_STRINGEOL", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_LUA_WORD2", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_LUA_WORD3", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_LUA_WORD4", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_LUA_WORD5", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_LUA_WORD6", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_LUA_WORD7", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_LUA_WORD8", SWIG_From_int((int)19));
+    PyDict_SetItemString(d,"STC_ERR_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_ERR_PYTHON", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_ERR_GCC", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_ERR_MS", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_ERR_CMD", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_ERR_BORLAND", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_ERR_PERL", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_ERR_NET", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_ERR_LUA", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_ERR_CTAG", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_ERR_DIFF_CHANGED", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_ERR_DIFF_ADDITION", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_ERR_DIFF_DELETION", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_ERR_DIFF_MESSAGE", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_ERR_PHP", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_ERR_ELF", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_ERR_IFC", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_ERR_IFORT", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_ERR_ABSF", SWIG_From_int((int)18));
+    PyDict_SetItemString(d,"STC_BAT_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_BAT_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_BAT_WORD", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_BAT_LABEL", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_BAT_HIDE", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_BAT_COMMAND", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_BAT_IDENTIFIER", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_BAT_OPERATOR", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_MAKE_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_MAKE_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_MAKE_PREPROCESSOR", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_MAKE_IDENTIFIER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_MAKE_OPERATOR", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_MAKE_TARGET", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_MAKE_IDEOL", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_DIFF_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_DIFF_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_DIFF_COMMAND", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_DIFF_HEADER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_DIFF_POSITION", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_DIFF_DELETED", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_DIFF_ADDED", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_CONF_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_CONF_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CONF_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CONF_IDENTIFIER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_CONF_EXTENSION", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_CONF_PARAMETER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_CONF_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_CONF_OPERATOR", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_CONF_IP", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_CONF_DIRECTIVE", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_AVE_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_AVE_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_AVE_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_AVE_WORD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_AVE_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_AVE_ENUM", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_AVE_STRINGEOL", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_AVE_IDENTIFIER", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_AVE_OPERATOR", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_AVE_WORD1", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_AVE_WORD2", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_AVE_WORD3", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_AVE_WORD4", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_AVE_WORD5", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_AVE_WORD6", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_ADA_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_ADA_WORD", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_ADA_IDENTIFIER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_ADA_NUMBER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_ADA_DELIMITER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_ADA_CHARACTER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_ADA_CHARACTEREOL", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_ADA_STRING", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_ADA_STRINGEOL", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_ADA_LABEL", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_ADA_COMMENTLINE", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_ADA_ILLEGAL", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_BAAN_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_BAAN_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_BAAN_COMMENTDOC", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_BAAN_NUMBER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_BAAN_WORD", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_BAAN_STRING", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_BAAN_PREPROCESSOR", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_BAAN_OPERATOR", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_BAAN_IDENTIFIER", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_BAAN_STRINGEOL", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_BAAN_WORD2", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_LISP_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_LISP_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_LISP_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_LISP_KEYWORD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_LISP_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_LISP_STRINGEOL", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_LISP_IDENTIFIER", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_LISP_OPERATOR", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_EIFFEL_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_EIFFEL_COMMENTLINE", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_EIFFEL_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_EIFFEL_WORD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_EIFFEL_STRING", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_EIFFEL_CHARACTER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_EIFFEL_OPERATOR", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_EIFFEL_IDENTIFIER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_EIFFEL_STRINGEOL", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_TASK", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_SECTION", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_KEYWORD", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_MODIFIER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_ASTERISK", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_NUMBER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_STRING", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_ENVIRONMENT", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_NNCRONTAB_IDENTIFIER", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_FORTH_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_FORTH_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_FORTH_COMMENT_ML", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_FORTH_IDENTIFIER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_FORTH_CONTROL", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_FORTH_KEYWORD", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_FORTH_DEFWORD", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_FORTH_PREWORD1", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_FORTH_PREWORD2", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_FORTH_NUMBER", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_FORTH_STRING", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_FORTH_LOCALE", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_MATLAB_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_MATLAB_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_MATLAB_COMMAND", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_MATLAB_NUMBER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_MATLAB_KEYWORD", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_MATLAB_STRING", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_MATLAB_OPERATOR", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_MATLAB_IDENTIFIER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_MATLAB_DOUBLEQUOTESTRING", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_WHITE", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_COMMENTLINE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_PERSISTENT", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_CSTYLE", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_COMMENTBLOCK", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_NUMBER", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_STRING", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_CHARACTER", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_STRINGEOL", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_KEYWORD", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_OPERATOR", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_IDENTIFIER", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_TRIPLE", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_CLASSNAME", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_SCRIPTOL_PREPROCESSOR", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_ASM_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_ASM_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_ASM_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_ASM_STRING", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_ASM_OPERATOR", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_ASM_IDENTIFIER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_ASM_CPUINSTRUCTION", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_ASM_MATHINSTRUCTION", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_ASM_REGISTER", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_ASM_DIRECTIVE", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_ASM_DIRECTIVEOPERAND", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_ASM_COMMENTBLOCK", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_ASM_CHARACTER", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_ASM_STRINGEOL", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_ASM_EXTINSTRUCTION", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_F_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_F_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_F_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_F_STRING1", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_F_STRING2", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_F_STRINGEOL", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_F_OPERATOR", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_F_IDENTIFIER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_F_WORD", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_F_WORD2", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_F_WORD3", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_F_PREPROCESSOR", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_F_OPERATOR2", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_F_LABEL", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_F_CONTINUATION", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_CSS_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_CSS_TAG", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CSS_CLASS", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CSS_PSEUDOCLASS", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_CSS_UNKNOWN_PSEUDOCLASS", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_CSS_OPERATOR", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_CSS_IDENTIFIER", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_CSS_UNKNOWN_IDENTIFIER", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_CSS_VALUE", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_CSS_COMMENT", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_CSS_ID", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_CSS_IMPORTANT", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_CSS_DIRECTIVE", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_CSS_DOUBLESTRING", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_CSS_SINGLESTRING", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_POV_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_POV_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_POV_COMMENTLINE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_POV_NUMBER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_POV_OPERATOR", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_POV_IDENTIFIER", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_POV_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_POV_STRINGEOL", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_POV_DIRECTIVE", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_POV_BADDIRECTIVE", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_POV_WORD2", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_POV_WORD3", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_POV_WORD4", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_POV_WORD5", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_POV_WORD6", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_POV_WORD7", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_POV_WORD8", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_LOUT_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_LOUT_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_LOUT_NUMBER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_LOUT_WORD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_LOUT_WORD2", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_LOUT_WORD3", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_LOUT_WORD4", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_LOUT_STRING", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_LOUT_OPERATOR", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_LOUT_IDENTIFIER", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_LOUT_STRINGEOL", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_ESCRIPT_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_ESCRIPT_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_ESCRIPT_COMMENTLINE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_ESCRIPT_COMMENTDOC", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_ESCRIPT_NUMBER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_ESCRIPT_WORD", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_ESCRIPT_STRING", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_ESCRIPT_OPERATOR", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_ESCRIPT_IDENTIFIER", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_ESCRIPT_BRACE", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_ESCRIPT_WORD2", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_ESCRIPT_WORD3", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_PS_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_PS_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_PS_DSC_COMMENT", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_PS_DSC_VALUE", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_PS_NUMBER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_PS_NAME", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_PS_KEYWORD", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_PS_LITERAL", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_PS_IMMEVAL", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_PS_PAREN_ARRAY", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_PS_PAREN_DICT", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_PS_PAREN_PROC", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_PS_TEXT", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_PS_HEXSTRING", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_PS_BASE85STRING", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_PS_BADSTRINGCHAR", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_NSIS_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_NSIS_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_NSIS_STRINGDQ", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_NSIS_STRINGLQ", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_NSIS_STRINGRQ", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_NSIS_FUNCTION", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_NSIS_VARIABLE", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_NSIS_LABEL", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_NSIS_USERDEFINED", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_NSIS_SECTIONDEF", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_NSIS_SUBSECTIONDEF", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_NSIS_IFDEFINEDEF", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_NSIS_MACRODEF", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_NSIS_STRINGVAR", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_MMIXAL_LEADWS", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_MMIXAL_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_MMIXAL_LABEL", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_PRE", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_VALID", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_UNKNOWN", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPCODE_POST", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPERANDS", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_MMIXAL_NUMBER", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_MMIXAL_REF", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_MMIXAL_CHAR", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_MMIXAL_STRING", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_MMIXAL_REGISTER", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_MMIXAL_HEX", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_MMIXAL_OPERATOR", SWIG_From_int((int)15));
+    PyDict_SetItemString(d,"STC_MMIXAL_SYMBOL", SWIG_From_int((int)16));
+    PyDict_SetItemString(d,"STC_MMIXAL_INCLUDE", SWIG_From_int((int)17));
+    PyDict_SetItemString(d,"STC_CLW_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_CLW_LABEL", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_CLW_COMMENT", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_CLW_STRING", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_CLW_USER_IDENTIFIER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_CLW_INTEGER_CONSTANT", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_CLW_REAL_CONSTANT", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_CLW_PICTURE_STRING", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_CLW_KEYWORD", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_CLW_COMPILER_DIRECTIVE", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_CLW_BUILTIN_PROCEDURES_FUNCTION", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_CLW_STRUCTURE_DATA_TYPE", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_CLW_ATTRIBUTE", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_CLW_STANDARD_EQUATE", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_CLW_ERROR", SWIG_From_int((int)14));
+    PyDict_SetItemString(d,"STC_LOT_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_LOT_HEADER", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_LOT_BREAK", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_LOT_SET", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_LOT_PASS", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_LOT_FAIL", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_LOT_ABORT", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_YAML_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_YAML_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_YAML_IDENTIFIER", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_YAML_KEYWORD", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_YAML_NUMBER", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_YAML_REFERENCE", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_YAML_DOCUMENT", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_YAML_TEXT", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_YAML_ERROR", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_TEX_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_TEX_SPECIAL", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_TEX_GROUP", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_TEX_SYMBOL", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_TEX_COMMAND", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_TEX_TEXT", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_METAPOST_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_METAPOST_SPECIAL", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_METAPOST_GROUP", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_METAPOST_SYMBOL", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_METAPOST_COMMAND", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_METAPOST_TEXT", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_METAPOST_EXTRA", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_ERLANG_DEFAULT", SWIG_From_int((int)0));
+    PyDict_SetItemString(d,"STC_ERLANG_COMMENT", SWIG_From_int((int)1));
+    PyDict_SetItemString(d,"STC_ERLANG_VARIABLE", SWIG_From_int((int)2));
+    PyDict_SetItemString(d,"STC_ERLANG_NUMBER", SWIG_From_int((int)3));
+    PyDict_SetItemString(d,"STC_ERLANG_KEYWORD", SWIG_From_int((int)4));
+    PyDict_SetItemString(d,"STC_ERLANG_STRING", SWIG_From_int((int)5));
+    PyDict_SetItemString(d,"STC_ERLANG_OPERATOR", SWIG_From_int((int)6));
+    PyDict_SetItemString(d,"STC_ERLANG_ATOM", SWIG_From_int((int)7));
+    PyDict_SetItemString(d,"STC_ERLANG_FUNCTION_NAME", SWIG_From_int((int)8));
+    PyDict_SetItemString(d,"STC_ERLANG_CHARACTER", SWIG_From_int((int)9));
+    PyDict_SetItemString(d,"STC_ERLANG_MACRO", SWIG_From_int((int)10));
+    PyDict_SetItemString(d,"STC_ERLANG_RECORD", SWIG_From_int((int)11));
+    PyDict_SetItemString(d,"STC_ERLANG_SEPARATOR", SWIG_From_int((int)12));
+    PyDict_SetItemString(d,"STC_ERLANG_NODE_NAME", SWIG_From_int((int)13));
+    PyDict_SetItemString(d,"STC_ERLANG_UNKNOWN", SWIG_From_int((int)31));
+    PyDict_SetItemString(d,"STC_CMD_REDO", SWIG_From_int((int)2011));
+    PyDict_SetItemString(d,"STC_CMD_SELECTALL", SWIG_From_int((int)2013));
+    PyDict_SetItemString(d,"STC_CMD_UNDO", SWIG_From_int((int)2176));
+    PyDict_SetItemString(d,"STC_CMD_CUT", SWIG_From_int((int)2177));
+    PyDict_SetItemString(d,"STC_CMD_COPY", SWIG_From_int((int)2178));
+    PyDict_SetItemString(d,"STC_CMD_PASTE", SWIG_From_int((int)2179));
+    PyDict_SetItemString(d,"STC_CMD_CLEAR", SWIG_From_int((int)2180));
+    PyDict_SetItemString(d,"STC_CMD_LINEDOWN", SWIG_From_int((int)2300));
+    PyDict_SetItemString(d,"STC_CMD_LINEDOWNEXTEND", SWIG_From_int((int)2301));
+    PyDict_SetItemString(d,"STC_CMD_LINEUP", SWIG_From_int((int)2302));
+    PyDict_SetItemString(d,"STC_CMD_LINEUPEXTEND", SWIG_From_int((int)2303));
+    PyDict_SetItemString(d,"STC_CMD_CHARLEFT", SWIG_From_int((int)2304));
+    PyDict_SetItemString(d,"STC_CMD_CHARLEFTEXTEND", SWIG_From_int((int)2305));
+    PyDict_SetItemString(d,"STC_CMD_CHARRIGHT", SWIG_From_int((int)2306));
+    PyDict_SetItemString(d,"STC_CMD_CHARRIGHTEXTEND", SWIG_From_int((int)2307));
+    PyDict_SetItemString(d,"STC_CMD_WORDLEFT", SWIG_From_int((int)2308));
+    PyDict_SetItemString(d,"STC_CMD_WORDLEFTEXTEND", SWIG_From_int((int)2309));
+    PyDict_SetItemString(d,"STC_CMD_WORDRIGHT", SWIG_From_int((int)2310));
+    PyDict_SetItemString(d,"STC_CMD_WORDRIGHTEXTEND", SWIG_From_int((int)2311));
+    PyDict_SetItemString(d,"STC_CMD_HOME", SWIG_From_int((int)2312));
+    PyDict_SetItemString(d,"STC_CMD_HOMEEXTEND", SWIG_From_int((int)2313));
+    PyDict_SetItemString(d,"STC_CMD_LINEEND", SWIG_From_int((int)2314));
+    PyDict_SetItemString(d,"STC_CMD_LINEENDEXTEND", SWIG_From_int((int)2315));
+    PyDict_SetItemString(d,"STC_CMD_DOCUMENTSTART", SWIG_From_int((int)2316));
+    PyDict_SetItemString(d,"STC_CMD_DOCUMENTSTARTEXTEND", SWIG_From_int((int)2317));
+    PyDict_SetItemString(d,"STC_CMD_DOCUMENTEND", SWIG_From_int((int)2318));
+    PyDict_SetItemString(d,"STC_CMD_DOCUMENTENDEXTEND", SWIG_From_int((int)2319));
+    PyDict_SetItemString(d,"STC_CMD_PAGEUP", SWIG_From_int((int)2320));
+    PyDict_SetItemString(d,"STC_CMD_PAGEUPEXTEND", SWIG_From_int((int)2321));
+    PyDict_SetItemString(d,"STC_CMD_PAGEDOWN", SWIG_From_int((int)2322));
+    PyDict_SetItemString(d,"STC_CMD_PAGEDOWNEXTEND", SWIG_From_int((int)2323));
+    PyDict_SetItemString(d,"STC_CMD_EDITTOGGLEOVERTYPE", SWIG_From_int((int)2324));
+    PyDict_SetItemString(d,"STC_CMD_CANCEL", SWIG_From_int((int)2325));
+    PyDict_SetItemString(d,"STC_CMD_DELETEBACK", SWIG_From_int((int)2326));
+    PyDict_SetItemString(d,"STC_CMD_TAB", SWIG_From_int((int)2327));
+    PyDict_SetItemString(d,"STC_CMD_BACKTAB", SWIG_From_int((int)2328));
+    PyDict_SetItemString(d,"STC_CMD_NEWLINE", SWIG_From_int((int)2329));
+    PyDict_SetItemString(d,"STC_CMD_FORMFEED", SWIG_From_int((int)2330));
+    PyDict_SetItemString(d,"STC_CMD_VCHOME", SWIG_From_int((int)2331));
+    PyDict_SetItemString(d,"STC_CMD_VCHOMEEXTEND", SWIG_From_int((int)2332));
+    PyDict_SetItemString(d,"STC_CMD_ZOOMIN", SWIG_From_int((int)2333));
+    PyDict_SetItemString(d,"STC_CMD_ZOOMOUT", SWIG_From_int((int)2334));
+    PyDict_SetItemString(d,"STC_CMD_DELWORDLEFT", SWIG_From_int((int)2335));
+    PyDict_SetItemString(d,"STC_CMD_DELWORDRIGHT", SWIG_From_int((int)2336));
+    PyDict_SetItemString(d,"STC_CMD_LINECUT", SWIG_From_int((int)2337));
+    PyDict_SetItemString(d,"STC_CMD_LINEDELETE", SWIG_From_int((int)2338));
+    PyDict_SetItemString(d,"STC_CMD_LINETRANSPOSE", SWIG_From_int((int)2339));
+    PyDict_SetItemString(d,"STC_CMD_LINEDUPLICATE", SWIG_From_int((int)2404));
+    PyDict_SetItemString(d,"STC_CMD_LOWERCASE", SWIG_From_int((int)2340));
+    PyDict_SetItemString(d,"STC_CMD_UPPERCASE", SWIG_From_int((int)2341));
+    PyDict_SetItemString(d,"STC_CMD_LINESCROLLDOWN", SWIG_From_int((int)2342));
+    PyDict_SetItemString(d,"STC_CMD_LINESCROLLUP", SWIG_From_int((int)2343));
+    PyDict_SetItemString(d,"STC_CMD_DELETEBACKNOTLINE", SWIG_From_int((int)2344));
+    PyDict_SetItemString(d,"STC_CMD_HOMEDISPLAY", SWIG_From_int((int)2345));
+    PyDict_SetItemString(d,"STC_CMD_HOMEDISPLAYEXTEND", SWIG_From_int((int)2346));
+    PyDict_SetItemString(d,"STC_CMD_LINEENDDISPLAY", SWIG_From_int((int)2347));
+    PyDict_SetItemString(d,"STC_CMD_LINEENDDISPLAYEXTEND", SWIG_From_int((int)2348));
+    PyDict_SetItemString(d,"STC_CMD_HOMEWRAP", SWIG_From_int((int)2349));
+    PyDict_SetItemString(d,"STC_CMD_HOMEWRAPEXTEND", SWIG_From_int((int)2450));
+    PyDict_SetItemString(d,"STC_CMD_LINEENDWRAP", SWIG_From_int((int)2451));
+    PyDict_SetItemString(d,"STC_CMD_LINEENDWRAPEXTEND", SWIG_From_int((int)2452));
+    PyDict_SetItemString(d,"STC_CMD_VCHOMEWRAP", SWIG_From_int((int)2453));
+    PyDict_SetItemString(d,"STC_CMD_VCHOMEWRAPEXTEND", SWIG_From_int((int)2454));
+    PyDict_SetItemString(d,"STC_CMD_LINECOPY", SWIG_From_int((int)2455));
+    PyDict_SetItemString(d,"STC_CMD_WORDPARTLEFT", SWIG_From_int((int)2390));
+    PyDict_SetItemString(d,"STC_CMD_WORDPARTLEFTEXTEND", SWIG_From_int((int)2391));
+    PyDict_SetItemString(d,"STC_CMD_WORDPARTRIGHT", SWIG_From_int((int)2392));
+    PyDict_SetItemString(d,"STC_CMD_WORDPARTRIGHTEXTEND", SWIG_From_int((int)2393));
+    PyDict_SetItemString(d,"STC_CMD_DELLINELEFT", SWIG_From_int((int)2395));
+    PyDict_SetItemString(d,"STC_CMD_DELLINERIGHT", SWIG_From_int((int)2396));
+    PyDict_SetItemString(d,"STC_CMD_PARADOWN", SWIG_From_int((int)2413));
+    PyDict_SetItemString(d,"STC_CMD_PARADOWNEXTEND", SWIG_From_int((int)2414));
+    PyDict_SetItemString(d,"STC_CMD_PARAUP", SWIG_From_int((int)2415));
+    PyDict_SetItemString(d,"STC_CMD_PARAUPEXTEND", SWIG_From_int((int)2416));
+    PyDict_SetItemString(d,"STC_CMD_LINEDOWNRECTEXTEND", SWIG_From_int((int)2426));
+    PyDict_SetItemString(d,"STC_CMD_LINEUPRECTEXTEND", SWIG_From_int((int)2427));
+    PyDict_SetItemString(d,"STC_CMD_CHARLEFTRECTEXTEND", SWIG_From_int((int)2428));
+    PyDict_SetItemString(d,"STC_CMD_CHARRIGHTRECTEXTEND", SWIG_From_int((int)2429));
+    PyDict_SetItemString(d,"STC_CMD_HOMERECTEXTEND", SWIG_From_int((int)2430));
+    PyDict_SetItemString(d,"STC_CMD_VCHOMERECTEXTEND", SWIG_From_int((int)2431));
+    PyDict_SetItemString(d,"STC_CMD_LINEENDRECTEXTEND", SWIG_From_int((int)2432));
+    PyDict_SetItemString(d,"STC_CMD_PAGEUPRECTEXTEND", SWIG_From_int((int)2433));
+    PyDict_SetItemString(d,"STC_CMD_PAGEDOWNRECTEXTEND", SWIG_From_int((int)2434));
+    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEUP", SWIG_From_int((int)2435));
+    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEUPEXTEND", SWIG_From_int((int)2436));
+    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEDOWN", SWIG_From_int((int)2437));
+    PyDict_SetItemString(d,"STC_CMD_STUTTEREDPAGEDOWNEXTEND", SWIG_From_int((int)2438));
+    PyDict_SetItemString(d,"STC_CMD_WORDLEFTEND", SWIG_From_int((int)2439));
+    PyDict_SetItemString(d,"STC_CMD_WORDLEFTENDEXTEND", SWIG_From_int((int)2440));
+    PyDict_SetItemString(d,"STC_CMD_WORDRIGHTEND", SWIG_From_int((int)2441));
+    PyDict_SetItemString(d,"STC_CMD_WORDRIGHTENDEXTEND", SWIG_From_int((int)2442));
+    PyDict_SetItemString(d,"wxEVT_STC_CHANGE", SWIG_From_int((int)wxEVT_STC_CHANGE));
+    PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", SWIG_From_int((int)wxEVT_STC_STYLENEEDED));
+    PyDict_SetItemString(d,"wxEVT_STC_CHARADDED", SWIG_From_int((int)wxEVT_STC_CHARADDED));
+    PyDict_SetItemString(d,"wxEVT_STC_SAVEPOINTREACHED", SWIG_From_int((int)wxEVT_STC_SAVEPOINTREACHED));
+    PyDict_SetItemString(d,"wxEVT_STC_SAVEPOINTLEFT", SWIG_From_int((int)wxEVT_STC_SAVEPOINTLEFT));
+    PyDict_SetItemString(d,"wxEVT_STC_ROMODIFYATTEMPT", SWIG_From_int((int)wxEVT_STC_ROMODIFYATTEMPT));
+    PyDict_SetItemString(d,"wxEVT_STC_KEY", SWIG_From_int((int)wxEVT_STC_KEY));
+    PyDict_SetItemString(d,"wxEVT_STC_DOUBLECLICK", SWIG_From_int((int)wxEVT_STC_DOUBLECLICK));
+    PyDict_SetItemString(d,"wxEVT_STC_UPDATEUI", SWIG_From_int((int)wxEVT_STC_UPDATEUI));
+    PyDict_SetItemString(d,"wxEVT_STC_MODIFIED", SWIG_From_int((int)wxEVT_STC_MODIFIED));
+    PyDict_SetItemString(d,"wxEVT_STC_MACRORECORD", SWIG_From_int((int)wxEVT_STC_MACRORECORD));
+    PyDict_SetItemString(d,"wxEVT_STC_MARGINCLICK", SWIG_From_int((int)wxEVT_STC_MARGINCLICK));
+    PyDict_SetItemString(d,"wxEVT_STC_NEEDSHOWN", SWIG_From_int((int)wxEVT_STC_NEEDSHOWN));
+    PyDict_SetItemString(d,"wxEVT_STC_PAINTED", SWIG_From_int((int)wxEVT_STC_PAINTED));
+    PyDict_SetItemString(d,"wxEVT_STC_USERLISTSELECTION", SWIG_From_int((int)wxEVT_STC_USERLISTSELECTION));
+    PyDict_SetItemString(d,"wxEVT_STC_URIDROPPED", SWIG_From_int((int)wxEVT_STC_URIDROPPED));
+    PyDict_SetItemString(d,"wxEVT_STC_DWELLSTART", SWIG_From_int((int)wxEVT_STC_DWELLSTART));
+    PyDict_SetItemString(d,"wxEVT_STC_DWELLEND", SWIG_From_int((int)wxEVT_STC_DWELLEND));
+    PyDict_SetItemString(d,"wxEVT_STC_START_DRAG", SWIG_From_int((int)wxEVT_STC_START_DRAG));
+    PyDict_SetItemString(d,"wxEVT_STC_DRAG_OVER", SWIG_From_int((int)wxEVT_STC_DRAG_OVER));
+    PyDict_SetItemString(d,"wxEVT_STC_DO_DROP", SWIG_From_int((int)wxEVT_STC_DO_DROP));
+    PyDict_SetItemString(d,"wxEVT_STC_ZOOM", SWIG_From_int((int)wxEVT_STC_ZOOM));
+    PyDict_SetItemString(d,"wxEVT_STC_HOTSPOT_CLICK", SWIG_From_int((int)wxEVT_STC_HOTSPOT_CLICK));
+    PyDict_SetItemString(d,"wxEVT_STC_HOTSPOT_DCLICK", SWIG_From_int((int)wxEVT_STC_HOTSPOT_DCLICK));
+    PyDict_SetItemString(d,"wxEVT_STC_CALLTIP_CLICK", SWIG_From_int((int)wxEVT_STC_CALLTIP_CLICK));
     
     
 }

diff --git a/wxPython/contrib/xrc/mac/xrc_wrap.cpp b/wxPython/contrib/xrc/mac/xrc_wrap.cpp
index afb0621e3a748e52cdcc81fa2e09f9aacee4ba0c..4d6954217afc97adf2cf2825753fd30cd36461b0 100644 (file)
--- a/wxPython/contrib/xrc/mac/xrc_wrap.cpp
+++ b/wxPython/contrib/xrc/mac/xrc_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxFrame swig_types[0] 
@@ -240,47 +242,64 @@ static swig_type_info *swig_types[23];
 
 #define SWIG_name    "_xrc"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -302,68 +321,97 @@ static swig_type_info *swig_types[23];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 bool wxXmlResource_LoadFromString(wxXmlResource *self,wxString const &data){
@@ -518,42 +566,79 @@ IMP_PYCALLBACK_BOOL_NODE_pure(wxPyXmlResourceHandler, wxXmlResourceHandler, CanH
 
 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIG_Check_bool(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}
+
+
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
+{
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_UTF8String_set(PyObject *_val) {
+static int _wrap_UTF8String_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable UTF8String is read-only.");
     return 1;
 }
@@ -573,7 +658,7 @@ static PyObject *_wrap_UTF8String_get() {
 }
 
 
-static int _wrap_StyleString_set(PyObject *_val) {
+static int _wrap_StyleString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable StyleString is read-only.");
     return 1;
 }
@@ -593,7 +678,7 @@ static PyObject *_wrap_StyleString_get() {
 }
 
 
-static int _wrap_SizeString_set(PyObject *_val) {
+static int _wrap_SizeString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SizeString is read-only.");
     return 1;
 }
@@ -613,7 +698,7 @@ static PyObject *_wrap_SizeString_get() {
 }
 
 
-static int _wrap_PosString_set(PyObject *_val) {
+static int _wrap_PosString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable PosString is read-only.");
     return 1;
 }
@@ -633,7 +718,7 @@ static PyObject *_wrap_PosString_get() {
 }
 
 
-static int _wrap_BitmapString_set(PyObject *_val) {
+static int _wrap_BitmapString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BitmapString is read-only.");
     return 1;
 }
@@ -653,7 +738,7 @@ static PyObject *_wrap_BitmapString_get() {
 }
 
 
-static int _wrap_IconString_set(PyObject *_val) {
+static int _wrap_IconString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable IconString is read-only.");
     return 1;
 }
@@ -673,7 +758,7 @@ static PyObject *_wrap_IconString_get() {
 }
 
 
-static int _wrap_FontString_set(PyObject *_val) {
+static int _wrap_FontString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FontString is read-only.");
     return 1;
 }
@@ -693,7 +778,7 @@ static PyObject *_wrap_FontString_get() {
 }
 
 
-static PyObject *_wrap_new_XmlResource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlResource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 = (int) wxXRC_USE_LOCALE ;
@@ -712,7 +797,7 @@ static PyObject *_wrap_new_XmlResource(PyObject *self, PyObject *args, PyObject
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -737,7 +822,7 @@ static PyObject *_wrap_new_XmlResource(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_EmptyXmlResource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EmptyXmlResource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxXRC_USE_LOCALE ;
     wxXmlResource *result;
@@ -748,7 +833,7 @@ static PyObject *_wrap_new_EmptyXmlResource(PyObject *self, PyObject *args, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_EmptyXmlResource",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -765,7 +850,7 @@ static PyObject *_wrap_new_EmptyXmlResource(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_XmlResource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_XmlResource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     PyObject * obj0 = 0 ;
@@ -790,7 +875,7 @@ static PyObject *_wrap_delete_XmlResource(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_XmlResource_Load(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_Load(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -834,7 +919,7 @@ static PyObject *_wrap_XmlResource_Load(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlResource_LoadFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadFromString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -878,7 +963,7 @@ static PyObject *_wrap_XmlResource_LoadFromString(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResource_InitAllHandlers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_InitAllHandlers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     PyObject * obj0 = 0 ;
@@ -903,7 +988,7 @@ static PyObject *_wrap_XmlResource_InitAllHandlers(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_XmlResource_AddHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxPyXmlResourceHandler *arg2 = (wxPyXmlResourceHandler *) 0 ;
@@ -932,7 +1017,7 @@ static PyObject *_wrap_XmlResource_AddHandler(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlResource_InsertHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_InsertHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxPyXmlResourceHandler *arg2 = (wxPyXmlResourceHandler *) 0 ;
@@ -961,7 +1046,7 @@ static PyObject *_wrap_XmlResource_InsertHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_XmlResource_ClearHandlers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_ClearHandlers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     PyObject * obj0 = 0 ;
@@ -986,7 +1071,7 @@ static PyObject *_wrap_XmlResource_ClearHandlers(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_XmlResource_AddSubclassFactory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_AddSubclassFactory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlSubclassFactory *arg1 = (wxPyXmlSubclassFactory *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1011,7 +1096,7 @@ static PyObject *_wrap_XmlResource_AddSubclassFactory(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_XmlResource_LoadMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -1055,7 +1140,7 @@ static PyObject *_wrap_XmlResource_LoadMenu(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_XmlResource_LoadMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -1099,7 +1184,7 @@ static PyObject *_wrap_XmlResource_LoadMenuBar(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_XmlResource_LoadMenuBarOnFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadMenuBarOnFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1147,7 +1232,7 @@ static PyObject *_wrap_XmlResource_LoadMenuBarOnFrame(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1195,7 +1280,7 @@ static PyObject *_wrap_XmlResource_LoadToolBar(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_XmlResource_LoadDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1243,7 +1328,7 @@ static PyObject *_wrap_XmlResource_LoadDialog(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlResource_LoadOnDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadOnDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxDialog *arg2 = (wxDialog *) 0 ;
@@ -1295,7 +1380,7 @@ static PyObject *_wrap_XmlResource_LoadOnDialog(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_XmlResource_LoadPanel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadPanel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1343,7 +1428,7 @@ static PyObject *_wrap_XmlResource_LoadPanel(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_XmlResource_LoadOnPanel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadOnPanel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxPanel *arg2 = (wxPanel *) 0 ;
@@ -1395,7 +1480,7 @@ static PyObject *_wrap_XmlResource_LoadOnPanel(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_XmlResource_LoadFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1443,7 +1528,7 @@ static PyObject *_wrap_XmlResource_LoadFrame(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_XmlResource_LoadOnFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadOnFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -1495,7 +1580,7 @@ static PyObject *_wrap_XmlResource_LoadOnFrame(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_XmlResource_LoadObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1559,7 +1644,7 @@ static PyObject *_wrap_XmlResource_LoadObject(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlResource_LoadOnObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadOnObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxObject *arg2 = (wxObject *) 0 ;
@@ -1627,7 +1712,7 @@ static PyObject *_wrap_XmlResource_LoadOnObject(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_XmlResource_LoadBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -1673,7 +1758,7 @@ static PyObject *_wrap_XmlResource_LoadBitmap(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlResource_LoadIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_LoadIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -1719,7 +1804,7 @@ static PyObject *_wrap_XmlResource_LoadIcon(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_XmlResource_AttachUnknownControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_AttachUnknownControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxString *arg2 = 0 ;
@@ -1773,7 +1858,7 @@ static PyObject *_wrap_XmlResource_AttachUnknownControl(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_XmlResource_GetXRCID(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_GetXRCID(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int result;
@@ -1796,7 +1881,7 @@ static PyObject *_wrap_XmlResource_GetXRCID(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp1)
         delete arg1;
@@ -1811,7 +1896,7 @@ static PyObject *_wrap_XmlResource_GetXRCID(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_XmlResource_GetVersion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_GetVersion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     long result;
@@ -1830,14 +1915,14 @@ static PyObject *_wrap_XmlResource_GetVersion(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_XmlResource_CompareVersion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_CompareVersion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     int arg2 ;
@@ -1857,13 +1942,13 @@ static PyObject *_wrap_XmlResource_CompareVersion(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:XmlResource_CompareVersion",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxXmlResource,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1872,14 +1957,14 @@ static PyObject *_wrap_XmlResource_CompareVersion(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_XmlResource_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *result;
     char *kwnames[] = {
@@ -1901,7 +1986,7 @@ static PyObject *_wrap_XmlResource_Get(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlResource_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     wxXmlResource *result;
@@ -1927,7 +2012,7 @@ static PyObject *_wrap_XmlResource_Set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlResource_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     int result;
@@ -1946,14 +2031,14 @@ static PyObject *_wrap_XmlResource_GetFlags(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_XmlResource_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResource_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlResource *arg1 = (wxXmlResource *) 0 ;
     int arg2 ;
@@ -1966,7 +2051,7 @@ static PyObject *_wrap_XmlResource_SetFlags(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlResource_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxXmlResource,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1982,14 +2067,14 @@ static PyObject *_wrap_XmlResource_SetFlags(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * XmlResource_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XmlResource_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxXmlResource, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_XmlSubclassFactory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlSubclassFactory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlSubclassFactory *result;
     char *kwnames[] = {
@@ -2011,7 +2096,7 @@ static PyObject *_wrap_new_XmlSubclassFactory(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlSubclassFactory__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlSubclassFactory__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlSubclassFactory *arg1 = (wxPyXmlSubclassFactory *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2042,14 +2127,14 @@ static PyObject *_wrap_XmlSubclassFactory__setCallbackInfo(PyObject *self, PyObj
 }
 
 
-static PyObject * XmlSubclassFactory_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XmlSubclassFactory_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyXmlSubclassFactory, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_XmlProperty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlProperty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -2115,7 +2200,7 @@ static PyObject *_wrap_new_XmlProperty(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlProperty_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlProperty_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxString result;
@@ -2147,7 +2232,7 @@ static PyObject *_wrap_XmlProperty_GetName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlProperty_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlProperty_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxString result;
@@ -2179,7 +2264,7 @@ static PyObject *_wrap_XmlProperty_GetValue(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_XmlProperty_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlProperty_GetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxXmlProperty *result;
@@ -2205,7 +2290,7 @@ static PyObject *_wrap_XmlProperty_GetNext(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlProperty_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlProperty_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxString *arg2 = 0 ;
@@ -2246,7 +2331,7 @@ static PyObject *_wrap_XmlProperty_SetName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlProperty_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlProperty_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxString *arg2 = 0 ;
@@ -2287,7 +2372,7 @@ static PyObject *_wrap_XmlProperty_SetValue(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_XmlProperty_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlProperty_SetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlProperty *arg1 = (wxXmlProperty *) 0 ;
     wxXmlProperty *arg2 = (wxXmlProperty *) 0 ;
@@ -2316,14 +2401,14 @@ static PyObject *_wrap_XmlProperty_SetNext(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * XmlProperty_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XmlProperty_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxXmlProperty, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_XmlNode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlNode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) NULL ;
     int arg2 = (int) 0 ;
@@ -2352,7 +2437,7 @@ static PyObject *_wrap_new_XmlNode(PyObject *self, PyObject *args, PyObject *kwa
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxXmlNodeType) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -2407,7 +2492,7 @@ static PyObject *_wrap_new_XmlNode(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_XmlNode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_XmlNode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2432,7 +2517,7 @@ static PyObject *_wrap_delete_XmlNode(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_XmlNodeEasy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlNodeEasy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxString *arg2 = 0 ;
@@ -2449,7 +2534,7 @@ static PyObject *_wrap_new_XmlNodeEasy(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_XmlNodeEasy",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (wxXmlNodeType) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
@@ -2493,7 +2578,7 @@ static PyObject *_wrap_new_XmlNodeEasy(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -2522,7 +2607,7 @@ static PyObject *_wrap_XmlNode_AddChild(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_InsertChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_InsertChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -2555,7 +2640,7 @@ static PyObject *_wrap_XmlNode_InsertChild(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlNode_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -2587,7 +2672,7 @@ static PyObject *_wrap_XmlNode_RemoveChild(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlNode_AddProperty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_AddProperty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlProperty *arg2 = (wxXmlProperty *) 0 ;
@@ -2616,7 +2701,7 @@ static PyObject *_wrap_XmlNode_AddProperty(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlNode_AddPropertyName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_AddPropertyName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
@@ -2673,7 +2758,7 @@ static PyObject *_wrap_XmlNode_AddPropertyName(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_XmlNode_DeleteProperty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_DeleteProperty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
@@ -2717,7 +2802,7 @@ static PyObject *_wrap_XmlNode_DeleteProperty(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlNode_GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     int result;
@@ -2736,14 +2821,14 @@ static PyObject *_wrap_XmlNode_GetType(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_XmlNode_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString result;
@@ -2775,7 +2860,7 @@ static PyObject *_wrap_XmlNode_GetName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_GetContent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetContent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString result;
@@ -2807,7 +2892,7 @@ static PyObject *_wrap_XmlNode_GetContent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_XmlNode_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *result;
@@ -2833,7 +2918,7 @@ static PyObject *_wrap_XmlNode_GetParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_XmlNode_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *result;
@@ -2859,7 +2944,7 @@ static PyObject *_wrap_XmlNode_GetNext(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *result;
@@ -2885,7 +2970,7 @@ static PyObject *_wrap_XmlNode_GetChildren(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlNode_GetProperties(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetProperties(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlProperty *result;
@@ -2911,7 +2996,7 @@ static PyObject *_wrap_XmlNode_GetProperties(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_XmlNode_GetPropVal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_GetPropVal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
@@ -2975,7 +3060,7 @@ static PyObject *_wrap_XmlNode_GetPropVal(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_XmlNode_HasProp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_HasProp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
@@ -3019,7 +3104,7 @@ static PyObject *_wrap_XmlNode_HasProp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_SetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     int arg2 ;
@@ -3032,7 +3117,7 @@ static PyObject *_wrap_XmlNode_SetType(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:XmlNode_SetType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxXmlNode,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxXmlNodeType) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3048,7 +3133,7 @@ static PyObject *_wrap_XmlNode_SetType(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
@@ -3089,7 +3174,7 @@ static PyObject *_wrap_XmlNode_SetName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_SetContent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetContent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxString *arg2 = 0 ;
@@ -3130,7 +3215,7 @@ static PyObject *_wrap_XmlNode_SetContent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_XmlNode_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -3159,7 +3244,7 @@ static PyObject *_wrap_XmlNode_SetParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_XmlNode_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -3188,7 +3273,7 @@ static PyObject *_wrap_XmlNode_SetNext(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlNode_SetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -3217,7 +3302,7 @@ static PyObject *_wrap_XmlNode_SetChildren(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlNode_SetProperties(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlNode_SetProperties(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlNode *arg1 = (wxXmlNode *) 0 ;
     wxXmlProperty *arg2 = (wxXmlProperty *) 0 ;
@@ -3246,14 +3331,14 @@ static PyObject *_wrap_XmlNode_SetProperties(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * XmlNode_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XmlNode_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxXmlNode, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_XmlDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyUTF8String ;
@@ -3310,7 +3395,7 @@ static PyObject *_wrap_new_XmlDocument(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyUTF8String ;
@@ -3377,7 +3462,7 @@ static PyObject *_wrap_new_XmlDocumentFromStream(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_EmptyXmlDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EmptyXmlDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *result;
     char *kwnames[] = {
@@ -3399,7 +3484,7 @@ static PyObject *_wrap_new_EmptyXmlDocument(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_XmlDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_XmlDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3424,7 +3509,7 @@ static PyObject *_wrap_delete_XmlDocument(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_XmlDocument_Load(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_Load(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
@@ -3487,7 +3572,7 @@ static PyObject *_wrap_XmlDocument_Load(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxInputStream *arg2 = 0 ;
@@ -3560,7 +3645,7 @@ static PyObject *_wrap_XmlDocument_LoadFromStream(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlDocument_Save(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_Save(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
@@ -3604,7 +3689,7 @@ static PyObject *_wrap_XmlDocument_Save(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlDocument_SaveToStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_SaveToStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxOutputStream *arg2 = 0 ;
@@ -3641,7 +3726,7 @@ static PyObject *_wrap_XmlDocument_SaveToStream(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_XmlDocument_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     bool result;
@@ -3669,7 +3754,7 @@ static PyObject *_wrap_XmlDocument_IsOk(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_XmlDocument_GetRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_GetRoot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxXmlNode *result;
@@ -3695,7 +3780,7 @@ static PyObject *_wrap_XmlDocument_GetRoot(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlDocument_GetVersion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_GetVersion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString result;
@@ -3727,7 +3812,7 @@ static PyObject *_wrap_XmlDocument_GetVersion(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlDocument_GetFileEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_GetFileEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString result;
@@ -3759,7 +3844,7 @@ static PyObject *_wrap_XmlDocument_GetFileEncoding(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_XmlDocument_SetRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_SetRoot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -3788,7 +3873,7 @@ static PyObject *_wrap_XmlDocument_SetRoot(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_XmlDocument_SetVersion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_SetVersion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
@@ -3829,7 +3914,7 @@ static PyObject *_wrap_XmlDocument_SetVersion(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlDocument_SetFileEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlDocument_SetFileEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXmlDocument *arg1 = (wxXmlDocument *) 0 ;
     wxString *arg2 = 0 ;
@@ -3870,14 +3955,14 @@ static PyObject *_wrap_XmlDocument_SetFileEncoding(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * XmlDocument_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XmlDocument_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxXmlDocument, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_XmlResourceHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XmlResourceHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *result;
     char *kwnames[] = {
@@ -3899,7 +3984,7 @@ static PyObject *_wrap_new_XmlResourceHandler(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_XmlResourceHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -3930,7 +4015,7 @@ static PyObject *_wrap_XmlResourceHandler__setCallbackInfo(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_CreateResource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_CreateResource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -3970,7 +4055,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResource(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_SetParentResource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_SetParentResource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlResource *arg2 = (wxXmlResource *) 0 ;
@@ -3999,7 +4084,7 @@ static PyObject *_wrap_XmlResourceHandler_SetParentResource(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetResource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetResource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlResource *result;
@@ -4025,7 +4110,7 @@ static PyObject *_wrap_XmlResourceHandler_GetResource(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetNode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetNode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlNode *result;
@@ -4051,7 +4136,7 @@ static PyObject *_wrap_XmlResourceHandler_GetNode(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetClass(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetClass(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString result;
@@ -4083,7 +4168,7 @@ static PyObject *_wrap_XmlResourceHandler_GetClass(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxObject *result;
@@ -4111,7 +4196,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParent(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetInstance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetInstance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxObject *result;
@@ -4139,7 +4224,7 @@ static PyObject *_wrap_XmlResourceHandler_GetInstance(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetParentAsWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetParentAsWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxWindow *result;
@@ -4167,7 +4252,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParentAsWindow(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetInstanceAsWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetInstanceAsWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxWindow *result;
@@ -4195,7 +4280,7 @@ static PyObject *_wrap_XmlResourceHandler_GetInstanceAsWindow(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_IsOfClass(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_IsOfClass(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -4243,7 +4328,7 @@ static PyObject *_wrap_XmlResourceHandler_IsOfClass(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetNodeContent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetNodeContent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -4279,7 +4364,7 @@ static PyObject *_wrap_XmlResourceHandler_GetNodeContent(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_HasParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_HasParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4323,7 +4408,7 @@ static PyObject *_wrap_XmlResourceHandler_HasParam(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetParamNode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetParamNode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4365,7 +4450,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParamNode(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetParamValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetParamValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4413,7 +4498,7 @@ static PyObject *_wrap_XmlResourceHandler_GetParamValue(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_AddStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_AddStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4434,7 +4519,7 @@ static PyObject *_wrap_XmlResourceHandler_AddStyle(PyObject *self, PyObject *arg
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4458,7 +4543,7 @@ static PyObject *_wrap_XmlResourceHandler_AddStyle(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_AddWindowStyles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_AddWindowStyles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4483,7 +4568,7 @@ static PyObject *_wrap_XmlResourceHandler_AddWindowStyles(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString const &arg2_defvalue = wxPyStyleString ;
@@ -4509,7 +4594,7 @@ static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *self, PyObject *arg
         }
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4519,7 +4604,7 @@ static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -4534,7 +4619,7 @@ static PyObject *_wrap_XmlResourceHandler_GetStyle(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4557,7 +4642,7 @@ static PyObject *_wrap_XmlResourceHandler_GetText(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4588,7 +4673,7 @@ static PyObject *_wrap_XmlResourceHandler_GetText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetID(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetID(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     int result;
@@ -4607,14 +4692,14 @@ static PyObject *_wrap_XmlResourceHandler_GetID(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString result;
@@ -4646,7 +4731,7 @@ static PyObject *_wrap_XmlResourceHandler_GetName(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetBool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetBool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4669,7 +4754,7 @@ static PyObject *_wrap_XmlResourceHandler_GetBool(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4696,7 +4781,7 @@ static PyObject *_wrap_XmlResourceHandler_GetBool(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4719,7 +4804,7 @@ static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4729,7 +4814,7 @@ static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp2)
         delete arg2;
@@ -4744,7 +4829,7 @@ static PyObject *_wrap_XmlResourceHandler_GetLong(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4790,7 +4875,7 @@ static PyObject *_wrap_XmlResourceHandler_GetColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString const &arg2_defvalue = wxPySizeString ;
@@ -4839,7 +4924,7 @@ static PyObject *_wrap_XmlResourceHandler_GetSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString const &arg2_defvalue = wxPyPosString ;
@@ -4888,7 +4973,7 @@ static PyObject *_wrap_XmlResourceHandler_GetPosition(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -4911,7 +4996,7 @@ static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *self, PyObject
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4921,7 +5006,7 @@ static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -4936,7 +5021,7 @@ static PyObject *_wrap_XmlResourceHandler_GetDimension(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString const &arg2_defvalue = wxPyBitmapString ;
@@ -5005,7 +5090,7 @@ static PyObject *_wrap_XmlResourceHandler_GetBitmap(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString const &arg2_defvalue = wxPyIconString ;
@@ -5074,7 +5159,7 @@ static PyObject *_wrap_XmlResourceHandler_GetIcon(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxString const &arg2_defvalue = wxPyFontString ;
@@ -5123,7 +5208,7 @@ static PyObject *_wrap_XmlResourceHandler_GetFont(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_SetupWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_SetupWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5152,7 +5237,7 @@ static PyObject *_wrap_XmlResourceHandler_SetupWindow(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_CreateChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_CreateChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxObject *arg2 = (wxObject *) 0 ;
@@ -5170,7 +5255,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateChildren(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxObject,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5187,7 +5272,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateChildren(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_CreateChildrenPrivately(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_CreateChildrenPrivately(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxObject *arg2 = (wxObject *) 0 ;
@@ -5222,7 +5307,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateChildrenPrivately(PyObject *self
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_CreateResFromNode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_CreateResFromNode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxXmlNode *arg2 = (wxXmlNode *) 0 ;
@@ -5264,7 +5349,7 @@ static PyObject *_wrap_XmlResourceHandler_CreateResFromNode(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_XmlResourceHandler_GetCurFileSystem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_XmlResourceHandler_GetCurFileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ;
     wxFileSystem *result;
@@ -5293,7 +5378,7 @@ static PyObject *_wrap_XmlResourceHandler_GetCurFileSystem(PyObject *self, PyObj
 }
 
 
-static PyObject * XmlResourceHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XmlResourceHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyXmlResourceHandler, obj);
@@ -5301,130 +5386,130 @@ static PyObject * XmlResourceHandler_swigregister(PyObject *self, PyObject *args
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_XmlResource", (PyCFunction) _wrap_new_XmlResource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_EmptyXmlResource", (PyCFunction) _wrap_new_EmptyXmlResource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_XmlResource", (PyCFunction) _wrap_delete_XmlResource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_Load", (PyCFunction) _wrap_XmlResource_Load, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadFromString", (PyCFunction) _wrap_XmlResource_LoadFromString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_InitAllHandlers", (PyCFunction) _wrap_XmlResource_InitAllHandlers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_AddHandler", (PyCFunction) _wrap_XmlResource_AddHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_InsertHandler", (PyCFunction) _wrap_XmlResource_InsertHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_ClearHandlers", (PyCFunction) _wrap_XmlResource_ClearHandlers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_AddSubclassFactory", (PyCFunction) _wrap_XmlResource_AddSubclassFactory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadMenu", (PyCFunction) _wrap_XmlResource_LoadMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadMenuBar", (PyCFunction) _wrap_XmlResource_LoadMenuBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadMenuBarOnFrame", (PyCFunction) _wrap_XmlResource_LoadMenuBarOnFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadToolBar", (PyCFunction) _wrap_XmlResource_LoadToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadDialog", (PyCFunction) _wrap_XmlResource_LoadDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadOnDialog", (PyCFunction) _wrap_XmlResource_LoadOnDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadPanel", (PyCFunction) _wrap_XmlResource_LoadPanel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadOnPanel", (PyCFunction) _wrap_XmlResource_LoadOnPanel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadFrame", (PyCFunction) _wrap_XmlResource_LoadFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadOnFrame", (PyCFunction) _wrap_XmlResource_LoadOnFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadObject", (PyCFunction) _wrap_XmlResource_LoadObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadOnObject", (PyCFunction) _wrap_XmlResource_LoadOnObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadBitmap", (PyCFunction) _wrap_XmlResource_LoadBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_LoadIcon", (PyCFunction) _wrap_XmlResource_LoadIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_AttachUnknownControl", (PyCFunction) _wrap_XmlResource_AttachUnknownControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_GetXRCID", (PyCFunction) _wrap_XmlResource_GetXRCID, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_GetVersion", (PyCFunction) _wrap_XmlResource_GetVersion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_CompareVersion", (PyCFunction) _wrap_XmlResource_CompareVersion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_Get", (PyCFunction) _wrap_XmlResource_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_Set", (PyCFunction) _wrap_XmlResource_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_GetFlags", (PyCFunction) _wrap_XmlResource_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_SetFlags", (PyCFunction) _wrap_XmlResource_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResource_swigregister", XmlResource_swigregister, METH_VARARGS },
-        { (char *)"new_XmlSubclassFactory", (PyCFunction) _wrap_new_XmlSubclassFactory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlSubclassFactory__setCallbackInfo", (PyCFunction) _wrap_XmlSubclassFactory__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlSubclassFactory_swigregister", XmlSubclassFactory_swigregister, METH_VARARGS },
-        { (char *)"new_XmlProperty", (PyCFunction) _wrap_new_XmlProperty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_GetName", (PyCFunction) _wrap_XmlProperty_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_GetValue", (PyCFunction) _wrap_XmlProperty_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_GetNext", (PyCFunction) _wrap_XmlProperty_GetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_SetName", (PyCFunction) _wrap_XmlProperty_SetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_SetValue", (PyCFunction) _wrap_XmlProperty_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_SetNext", (PyCFunction) _wrap_XmlProperty_SetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlProperty_swigregister", XmlProperty_swigregister, METH_VARARGS },
-        { (char *)"new_XmlNode", (PyCFunction) _wrap_new_XmlNode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_XmlNode", (PyCFunction) _wrap_delete_XmlNode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_XmlNodeEasy", (PyCFunction) _wrap_new_XmlNodeEasy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_AddChild", (PyCFunction) _wrap_XmlNode_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_InsertChild", (PyCFunction) _wrap_XmlNode_InsertChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_RemoveChild", (PyCFunction) _wrap_XmlNode_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_AddProperty", (PyCFunction) _wrap_XmlNode_AddProperty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_AddPropertyName", (PyCFunction) _wrap_XmlNode_AddPropertyName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_DeleteProperty", (PyCFunction) _wrap_XmlNode_DeleteProperty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetType", (PyCFunction) _wrap_XmlNode_GetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetName", (PyCFunction) _wrap_XmlNode_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetContent", (PyCFunction) _wrap_XmlNode_GetContent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetParent", (PyCFunction) _wrap_XmlNode_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetNext", (PyCFunction) _wrap_XmlNode_GetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetChildren", (PyCFunction) _wrap_XmlNode_GetChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetProperties", (PyCFunction) _wrap_XmlNode_GetProperties, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_GetPropVal", (PyCFunction) _wrap_XmlNode_GetPropVal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_HasProp", (PyCFunction) _wrap_XmlNode_HasProp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetType", (PyCFunction) _wrap_XmlNode_SetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetName", (PyCFunction) _wrap_XmlNode_SetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetContent", (PyCFunction) _wrap_XmlNode_SetContent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetParent", (PyCFunction) _wrap_XmlNode_SetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetNext", (PyCFunction) _wrap_XmlNode_SetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetChildren", (PyCFunction) _wrap_XmlNode_SetChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_SetProperties", (PyCFunction) _wrap_XmlNode_SetProperties, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlNode_swigregister", XmlNode_swigregister, METH_VARARGS },
-        { (char *)"new_XmlDocument", (PyCFunction) _wrap_new_XmlDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_XmlDocumentFromStream", (PyCFunction) _wrap_new_XmlDocumentFromStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_EmptyXmlDocument", (PyCFunction) _wrap_new_EmptyXmlDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_XmlDocument", (PyCFunction) _wrap_delete_XmlDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_Load", (PyCFunction) _wrap_XmlDocument_Load, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_LoadFromStream", (PyCFunction) _wrap_XmlDocument_LoadFromStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_Save", (PyCFunction) _wrap_XmlDocument_Save, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_SaveToStream", (PyCFunction) _wrap_XmlDocument_SaveToStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_IsOk", (PyCFunction) _wrap_XmlDocument_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_GetRoot", (PyCFunction) _wrap_XmlDocument_GetRoot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_GetVersion", (PyCFunction) _wrap_XmlDocument_GetVersion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_GetFileEncoding", (PyCFunction) _wrap_XmlDocument_GetFileEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_SetRoot", (PyCFunction) _wrap_XmlDocument_SetRoot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_SetVersion", (PyCFunction) _wrap_XmlDocument_SetVersion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_SetFileEncoding", (PyCFunction) _wrap_XmlDocument_SetFileEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlDocument_swigregister", XmlDocument_swigregister, METH_VARARGS },
-        { (char *)"new_XmlResourceHandler", (PyCFunction) _wrap_new_XmlResourceHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler__setCallbackInfo", (PyCFunction) _wrap_XmlResourceHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_CreateResource", (PyCFunction) _wrap_XmlResourceHandler_CreateResource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_SetParentResource", (PyCFunction) _wrap_XmlResourceHandler_SetParentResource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetResource", (PyCFunction) _wrap_XmlResourceHandler_GetResource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetNode", (PyCFunction) _wrap_XmlResourceHandler_GetNode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetClass", (PyCFunction) _wrap_XmlResourceHandler_GetClass, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetParent", (PyCFunction) _wrap_XmlResourceHandler_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetInstance", (PyCFunction) _wrap_XmlResourceHandler_GetInstance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetParentAsWindow", (PyCFunction) _wrap_XmlResourceHandler_GetParentAsWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetInstanceAsWindow", (PyCFunction) _wrap_XmlResourceHandler_GetInstanceAsWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_IsOfClass", (PyCFunction) _wrap_XmlResourceHandler_IsOfClass, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetNodeContent", (PyCFunction) _wrap_XmlResourceHandler_GetNodeContent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_HasParam", (PyCFunction) _wrap_XmlResourceHandler_HasParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetParamNode", (PyCFunction) _wrap_XmlResourceHandler_GetParamNode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetParamValue", (PyCFunction) _wrap_XmlResourceHandler_GetParamValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_AddStyle", (PyCFunction) _wrap_XmlResourceHandler_AddStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_AddWindowStyles", (PyCFunction) _wrap_XmlResourceHandler_AddWindowStyles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetStyle", (PyCFunction) _wrap_XmlResourceHandler_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetText", (PyCFunction) _wrap_XmlResourceHandler_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetID", (PyCFunction) _wrap_XmlResourceHandler_GetID, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetName", (PyCFunction) _wrap_XmlResourceHandler_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetBool", (PyCFunction) _wrap_XmlResourceHandler_GetBool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetLong", (PyCFunction) _wrap_XmlResourceHandler_GetLong, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetColour", (PyCFunction) _wrap_XmlResourceHandler_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetSize", (PyCFunction) _wrap_XmlResourceHandler_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetPosition", (PyCFunction) _wrap_XmlResourceHandler_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetDimension", (PyCFunction) _wrap_XmlResourceHandler_GetDimension, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetBitmap", (PyCFunction) _wrap_XmlResourceHandler_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetIcon", (PyCFunction) _wrap_XmlResourceHandler_GetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetFont", (PyCFunction) _wrap_XmlResourceHandler_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_SetupWindow", (PyCFunction) _wrap_XmlResourceHandler_SetupWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_CreateChildren", (PyCFunction) _wrap_XmlResourceHandler_CreateChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_CreateChildrenPrivately", (PyCFunction) _wrap_XmlResourceHandler_CreateChildrenPrivately, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_CreateResFromNode", (PyCFunction) _wrap_XmlResourceHandler_CreateResFromNode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_GetCurFileSystem", (PyCFunction) _wrap_XmlResourceHandler_GetCurFileSystem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XmlResourceHandler_swigregister", XmlResourceHandler_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_XmlResource", (PyCFunction) _wrap_new_XmlResource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_EmptyXmlResource", (PyCFunction) _wrap_new_EmptyXmlResource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_XmlResource", (PyCFunction) _wrap_delete_XmlResource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_Load", (PyCFunction) _wrap_XmlResource_Load, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadFromString", (PyCFunction) _wrap_XmlResource_LoadFromString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_InitAllHandlers", (PyCFunction) _wrap_XmlResource_InitAllHandlers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_AddHandler", (PyCFunction) _wrap_XmlResource_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_InsertHandler", (PyCFunction) _wrap_XmlResource_InsertHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_ClearHandlers", (PyCFunction) _wrap_XmlResource_ClearHandlers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_AddSubclassFactory", (PyCFunction) _wrap_XmlResource_AddSubclassFactory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadMenu", (PyCFunction) _wrap_XmlResource_LoadMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadMenuBar", (PyCFunction) _wrap_XmlResource_LoadMenuBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadMenuBarOnFrame", (PyCFunction) _wrap_XmlResource_LoadMenuBarOnFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadToolBar", (PyCFunction) _wrap_XmlResource_LoadToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadDialog", (PyCFunction) _wrap_XmlResource_LoadDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadOnDialog", (PyCFunction) _wrap_XmlResource_LoadOnDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadPanel", (PyCFunction) _wrap_XmlResource_LoadPanel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadOnPanel", (PyCFunction) _wrap_XmlResource_LoadOnPanel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadFrame", (PyCFunction) _wrap_XmlResource_LoadFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadOnFrame", (PyCFunction) _wrap_XmlResource_LoadOnFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadObject", (PyCFunction) _wrap_XmlResource_LoadObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadOnObject", (PyCFunction) _wrap_XmlResource_LoadOnObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadBitmap", (PyCFunction) _wrap_XmlResource_LoadBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_LoadIcon", (PyCFunction) _wrap_XmlResource_LoadIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_AttachUnknownControl", (PyCFunction) _wrap_XmlResource_AttachUnknownControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_GetXRCID", (PyCFunction) _wrap_XmlResource_GetXRCID, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_GetVersion", (PyCFunction) _wrap_XmlResource_GetVersion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_CompareVersion", (PyCFunction) _wrap_XmlResource_CompareVersion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_Get", (PyCFunction) _wrap_XmlResource_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_Set", (PyCFunction) _wrap_XmlResource_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_GetFlags", (PyCFunction) _wrap_XmlResource_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_SetFlags", (PyCFunction) _wrap_XmlResource_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResource_swigregister", XmlResource_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_XmlSubclassFactory", (PyCFunction) _wrap_new_XmlSubclassFactory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlSubclassFactory__setCallbackInfo", (PyCFunction) _wrap_XmlSubclassFactory__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlSubclassFactory_swigregister", XmlSubclassFactory_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_XmlProperty", (PyCFunction) _wrap_new_XmlProperty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_GetName", (PyCFunction) _wrap_XmlProperty_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_GetValue", (PyCFunction) _wrap_XmlProperty_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_GetNext", (PyCFunction) _wrap_XmlProperty_GetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_SetName", (PyCFunction) _wrap_XmlProperty_SetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_SetValue", (PyCFunction) _wrap_XmlProperty_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_SetNext", (PyCFunction) _wrap_XmlProperty_SetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlProperty_swigregister", XmlProperty_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_XmlNode", (PyCFunction) _wrap_new_XmlNode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_XmlNode", (PyCFunction) _wrap_delete_XmlNode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_XmlNodeEasy", (PyCFunction) _wrap_new_XmlNodeEasy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_AddChild", (PyCFunction) _wrap_XmlNode_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_InsertChild", (PyCFunction) _wrap_XmlNode_InsertChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_RemoveChild", (PyCFunction) _wrap_XmlNode_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_AddProperty", (PyCFunction) _wrap_XmlNode_AddProperty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_AddPropertyName", (PyCFunction) _wrap_XmlNode_AddPropertyName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_DeleteProperty", (PyCFunction) _wrap_XmlNode_DeleteProperty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetType", (PyCFunction) _wrap_XmlNode_GetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetName", (PyCFunction) _wrap_XmlNode_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetContent", (PyCFunction) _wrap_XmlNode_GetContent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetParent", (PyCFunction) _wrap_XmlNode_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetNext", (PyCFunction) _wrap_XmlNode_GetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetChildren", (PyCFunction) _wrap_XmlNode_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetProperties", (PyCFunction) _wrap_XmlNode_GetProperties, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_GetPropVal", (PyCFunction) _wrap_XmlNode_GetPropVal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_HasProp", (PyCFunction) _wrap_XmlNode_HasProp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetType", (PyCFunction) _wrap_XmlNode_SetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetName", (PyCFunction) _wrap_XmlNode_SetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetContent", (PyCFunction) _wrap_XmlNode_SetContent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetParent", (PyCFunction) _wrap_XmlNode_SetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetNext", (PyCFunction) _wrap_XmlNode_SetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetChildren", (PyCFunction) _wrap_XmlNode_SetChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_SetProperties", (PyCFunction) _wrap_XmlNode_SetProperties, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlNode_swigregister", XmlNode_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_XmlDocument", (PyCFunction) _wrap_new_XmlDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_XmlDocumentFromStream", (PyCFunction) _wrap_new_XmlDocumentFromStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_EmptyXmlDocument", (PyCFunction) _wrap_new_EmptyXmlDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_XmlDocument", (PyCFunction) _wrap_delete_XmlDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_Load", (PyCFunction) _wrap_XmlDocument_Load, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_LoadFromStream", (PyCFunction) _wrap_XmlDocument_LoadFromStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_Save", (PyCFunction) _wrap_XmlDocument_Save, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_SaveToStream", (PyCFunction) _wrap_XmlDocument_SaveToStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_IsOk", (PyCFunction) _wrap_XmlDocument_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_GetRoot", (PyCFunction) _wrap_XmlDocument_GetRoot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_GetVersion", (PyCFunction) _wrap_XmlDocument_GetVersion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_GetFileEncoding", (PyCFunction) _wrap_XmlDocument_GetFileEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_SetRoot", (PyCFunction) _wrap_XmlDocument_SetRoot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_SetVersion", (PyCFunction) _wrap_XmlDocument_SetVersion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_SetFileEncoding", (PyCFunction) _wrap_XmlDocument_SetFileEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlDocument_swigregister", XmlDocument_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_XmlResourceHandler", (PyCFunction) _wrap_new_XmlResourceHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler__setCallbackInfo", (PyCFunction) _wrap_XmlResourceHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_CreateResource", (PyCFunction) _wrap_XmlResourceHandler_CreateResource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_SetParentResource", (PyCFunction) _wrap_XmlResourceHandler_SetParentResource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetResource", (PyCFunction) _wrap_XmlResourceHandler_GetResource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetNode", (PyCFunction) _wrap_XmlResourceHandler_GetNode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetClass", (PyCFunction) _wrap_XmlResourceHandler_GetClass, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetParent", (PyCFunction) _wrap_XmlResourceHandler_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetInstance", (PyCFunction) _wrap_XmlResourceHandler_GetInstance, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetParentAsWindow", (PyCFunction) _wrap_XmlResourceHandler_GetParentAsWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetInstanceAsWindow", (PyCFunction) _wrap_XmlResourceHandler_GetInstanceAsWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_IsOfClass", (PyCFunction) _wrap_XmlResourceHandler_IsOfClass, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetNodeContent", (PyCFunction) _wrap_XmlResourceHandler_GetNodeContent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_HasParam", (PyCFunction) _wrap_XmlResourceHandler_HasParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetParamNode", (PyCFunction) _wrap_XmlResourceHandler_GetParamNode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetParamValue", (PyCFunction) _wrap_XmlResourceHandler_GetParamValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_AddStyle", (PyCFunction) _wrap_XmlResourceHandler_AddStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_AddWindowStyles", (PyCFunction) _wrap_XmlResourceHandler_AddWindowStyles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetStyle", (PyCFunction) _wrap_XmlResourceHandler_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetText", (PyCFunction) _wrap_XmlResourceHandler_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetID", (PyCFunction) _wrap_XmlResourceHandler_GetID, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetName", (PyCFunction) _wrap_XmlResourceHandler_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetBool", (PyCFunction) _wrap_XmlResourceHandler_GetBool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetLong", (PyCFunction) _wrap_XmlResourceHandler_GetLong, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetColour", (PyCFunction) _wrap_XmlResourceHandler_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetSize", (PyCFunction) _wrap_XmlResourceHandler_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetPosition", (PyCFunction) _wrap_XmlResourceHandler_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetDimension", (PyCFunction) _wrap_XmlResourceHandler_GetDimension, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetBitmap", (PyCFunction) _wrap_XmlResourceHandler_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetIcon", (PyCFunction) _wrap_XmlResourceHandler_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetFont", (PyCFunction) _wrap_XmlResourceHandler_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_SetupWindow", (PyCFunction) _wrap_XmlResourceHandler_SetupWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_CreateChildren", (PyCFunction) _wrap_XmlResourceHandler_CreateChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_CreateChildrenPrivately", (PyCFunction) _wrap_XmlResourceHandler_CreateChildrenPrivately, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_CreateResFromNode", (PyCFunction) _wrap_XmlResourceHandler_CreateResFromNode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_GetCurFileSystem", (PyCFunction) _wrap_XmlResourceHandler_GetCurFileSystem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XmlResourceHandler_swigregister", XmlResourceHandler_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -5720,7 +5805,7 @@ _swigt__p_wxSize,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -5754,26 +5839,26 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"BitmapString",_wrap_BitmapString_get, _wrap_BitmapString_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IconString",_wrap_IconString_get, _wrap_IconString_set);
     SWIG_addvarlink(SWIG_globals,(char*)"FontString",_wrap_FontString_get, _wrap_FontString_set);
-    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_MAJOR", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_MAJOR));
-    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_MINOR", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_MINOR));
-    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_RELEASE", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_RELEASE));
-    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION));
-    PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE));
-    PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING));
-    PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING));
-    PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE));
-    PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE));
-    PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE));
-    PyDict_SetItemString(d,"XML_CDATA_SECTION_NODE", SWIG_FromInt((int)wxXML_CDATA_SECTION_NODE));
-    PyDict_SetItemString(d,"XML_ENTITY_REF_NODE", SWIG_FromInt((int)wxXML_ENTITY_REF_NODE));
-    PyDict_SetItemString(d,"XML_ENTITY_NODE", SWIG_FromInt((int)wxXML_ENTITY_NODE));
-    PyDict_SetItemString(d,"XML_PI_NODE", SWIG_FromInt((int)wxXML_PI_NODE));
-    PyDict_SetItemString(d,"XML_COMMENT_NODE", SWIG_FromInt((int)wxXML_COMMENT_NODE));
-    PyDict_SetItemString(d,"XML_DOCUMENT_NODE", SWIG_FromInt((int)wxXML_DOCUMENT_NODE));
-    PyDict_SetItemString(d,"XML_DOCUMENT_TYPE_NODE", SWIG_FromInt((int)wxXML_DOCUMENT_TYPE_NODE));
-    PyDict_SetItemString(d,"XML_DOCUMENT_FRAG_NODE", SWIG_FromInt((int)wxXML_DOCUMENT_FRAG_NODE));
-    PyDict_SetItemString(d,"XML_NOTATION_NODE", SWIG_FromInt((int)wxXML_NOTATION_NODE));
-    PyDict_SetItemString(d,"XML_HTML_DOCUMENT_NODE", SWIG_FromInt((int)wxXML_HTML_DOCUMENT_NODE));
+    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_MAJOR", SWIG_From_int((int)WX_XMLRES_CURRENT_VERSION_MAJOR));
+    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_MINOR", SWIG_From_int((int)WX_XMLRES_CURRENT_VERSION_MINOR));
+    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_RELEASE", SWIG_From_int((int)WX_XMLRES_CURRENT_VERSION_RELEASE));
+    PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_From_int((int)WX_XMLRES_CURRENT_VERSION_REVISION));
+    PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_From_int((int)wxXRC_USE_LOCALE));
+    PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_From_int((int)wxXRC_NO_SUBCLASSING));
+    PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_From_int((int)wxXRC_NO_RELOADING));
+    PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_From_int((int)wxXML_ELEMENT_NODE));
+    PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_From_int((int)wxXML_ATTRIBUTE_NODE));
+    PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_From_int((int)wxXML_TEXT_NODE));
+    PyDict_SetItemString(d,"XML_CDATA_SECTION_NODE", SWIG_From_int((int)wxXML_CDATA_SECTION_NODE));
+    PyDict_SetItemString(d,"XML_ENTITY_REF_NODE", SWIG_From_int((int)wxXML_ENTITY_REF_NODE));
+    PyDict_SetItemString(d,"XML_ENTITY_NODE", SWIG_From_int((int)wxXML_ENTITY_NODE));
+    PyDict_SetItemString(d,"XML_PI_NODE", SWIG_From_int((int)wxXML_PI_NODE));
+    PyDict_SetItemString(d,"XML_COMMENT_NODE", SWIG_From_int((int)wxXML_COMMENT_NODE));
+    PyDict_SetItemString(d,"XML_DOCUMENT_NODE", SWIG_From_int((int)wxXML_DOCUMENT_NODE));
+    PyDict_SetItemString(d,"XML_DOCUMENT_TYPE_NODE", SWIG_From_int((int)wxXML_DOCUMENT_TYPE_NODE));
+    PyDict_SetItemString(d,"XML_DOCUMENT_FRAG_NODE", SWIG_From_int((int)wxXML_DOCUMENT_FRAG_NODE));
+    PyDict_SetItemString(d,"XML_NOTATION_NODE", SWIG_From_int((int)wxXML_NOTATION_NODE));
+    PyDict_SetItemString(d,"XML_HTML_DOCUMENT_NODE", SWIG_From_int((int)wxXML_HTML_DOCUMENT_NODE));
     
     
     wxXmlInitResourceModule();

diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp
index 8fa809f1bfdcf1e7de727088f97f9396944275b5..eff7456ff564e7b490d71cae4d6886b85dea2adb 100644 (file)
--- a/wxPython/src/mac/_controls_wrap.cpp
+++ b/wxPython/src/mac/_controls_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxTextUrlEvent swig_types[0] 
@@ -303,47 +305,64 @@ static swig_type_info *swig_types[86];
 
 #define SWIG_name    "_controls_"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -360,102 +379,168 @@ static swig_type_info *swig_types[86];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
 }
 
- static const wxString wxPyCheckBoxNameStr(wxCheckBoxNameStr); 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
+ static const wxString wxPyCheckBoxNameStr(wxCheckBoxNameStr); 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
     return 1;
   }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
+}
+
+
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
+{
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
  static const wxString wxPyChoiceNameStr(wxChoiceNameStr); 
@@ -505,21 +590,20 @@ void wxListBox_SetItemFont(wxListBox *self,int item,wxFont const &f){
         }
  static const wxString wxPyTextCtrlNameStr(wxTextCtrlNameStr); 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -532,31 +616,42 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  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");
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
     }
-    return i;
-  }
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 void wxTextCtrl_write(wxTextCtrl *self,wxString const &text){
@@ -598,11 +693,11 @@ public:
  static const wxString wxPyNOTEBOOK_NAME(wxNOTEBOOK_NAME); 
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
  static const wxString wxPyToolBarNameStr(wxToolBarNameStr); 
@@ -737,6 +832,7 @@ wxRect wxPyListCtrl_GetItemRect(wxPyListCtrl *self,long item,int code){
             self->GetItemRect(item, rect, code);
             return rect;
         }
+
 bool wxPyListCtrl_SortItems(wxPyListCtrl *self,PyObject *func){
             if (!PyCallable_Check(func))
                 return False;
@@ -805,52 +901,81 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
 
 
 #if UINT_MAX < LONG_MAX
-#define SWIG_FromUnsignedInt    SWIG_FromLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_long
+/*@@*/
 #else
-#define SWIG_FromUnsignedInt    SWIG_FromUnsignedLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long
+/*@@*/
 #endif
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
-                             unsigned long max_value) 
+SWIGSTATICINLINE(int)
+  SWIG_CheckUnsignedLongInRange(unsigned long value,
+                               unsigned long max_value,
+                               const char *errmsg) 
 {
-  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);
+  if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' minimum %ld",
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
-}
+  return 1;
+ }
 
 
 #if UINT_MAX != ULONG_MAX
-SWIGSTATICINLINE(unsigned int)
-SWIG_AsUnsignedInt(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 { 
-  return swig_numeric_cast(unsigned int,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned int", UINT_MAX));
+  const char* errmsg = val ? "unsigned int" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned int);
+      return 1;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong
+SWIGSTATICINLINE(unsigned int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedInt(PyObject* obj)
+SWIGSTATICINLINE(unsigned int)
+SWIG_As_unsigned_SS_int(PyObject* obj)
 {
-  SWIG_AsUnsignedInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned int v;
+  if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_int(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0);
 }
 
 wxPyTreeItemData *wxPyTreeCtrl_GetItemData(wxPyTreeCtrl *self,wxTreeItemId const &item){
@@ -931,6 +1056,16 @@ PyObject *wxPyTreeCtrl_GetBoundingRect(wxPyTreeCtrl *self,wxTreeItemId const &it
                 RETURN_NONE();
         }
  static const wxString wxPyDirDialogDefaultFolderStr(wxDirDialogDefaultFolderStr); 
+
+SWIGSTATICINLINE(PyObject*)
+  SWIG_From_bool(bool value)
+{
+  PyObject *obj = value ? Py_True : Py_False;
+  Py_INCREF(obj);
+  return obj;
+}
+
+
  // C++ version of Python aware wxControl
 class wxPyControl : public wxControl
 {
@@ -1017,7 +1152,7 @@ void wxHelpProvider_Destroy(wxHelpProvider *self){ delete self; }
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_ButtonNameStr_set(PyObject *_val) {
+static int _wrap_ButtonNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ButtonNameStr is read-only.");
     return 1;
 }
@@ -1037,7 +1172,7 @@ static PyObject *_wrap_ButtonNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Button(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1073,7 +1208,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1096,7 +1231,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1146,7 +1281,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxButton *result;
     char *kwnames[] = {
@@ -1169,7 +1304,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Button_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxButton *arg1 = (wxButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1209,7 +1344,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -1232,7 +1367,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -1283,7 +1418,7 @@ static PyObject *_wrap_Button_Create(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Button_SetDefault(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Button_SetDefault(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxButton *arg1 = (wxButton *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1308,7 +1443,7 @@ static PyObject *_wrap_Button_SetDefault(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Button_GetDefaultSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Button_GetDefaultSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize result;
     char *kwnames[] = {
@@ -1334,7 +1469,7 @@ static PyObject *_wrap_Button_GetDefaultSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Button_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Button_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -1345,7 +1480,7 @@ static PyObject *_wrap_Button_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Button_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1367,14 +1502,14 @@ static PyObject *_wrap_Button_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Button_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Button_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxButton, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BitmapButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1409,7 +1544,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1434,7 +1569,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1476,7 +1611,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreBitmapButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *result;
     char *kwnames[] = {
@@ -1499,7 +1634,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1538,7 +1673,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -1563,7 +1698,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -1606,7 +1741,7 @@ static PyObject *_wrap_BitmapButton_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_BitmapButton_GetBitmapLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_GetBitmapLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap result;
@@ -1636,7 +1771,7 @@ static PyObject *_wrap_BitmapButton_GetBitmapLabel(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_BitmapButton_GetBitmapDisabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_GetBitmapDisabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap result;
@@ -1666,7 +1801,7 @@ static PyObject *_wrap_BitmapButton_GetBitmapDisabled(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_BitmapButton_GetBitmapFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_GetBitmapFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap result;
@@ -1696,7 +1831,7 @@ static PyObject *_wrap_BitmapButton_GetBitmapFocus(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_BitmapButton_GetBitmapSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_GetBitmapSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap result;
@@ -1726,7 +1861,7 @@ static PyObject *_wrap_BitmapButton_GetBitmapSelected(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_BitmapButton_SetBitmapDisabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_SetBitmapDisabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -1760,7 +1895,7 @@ static PyObject *_wrap_BitmapButton_SetBitmapDisabled(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_BitmapButton_SetBitmapFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_SetBitmapFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -1794,7 +1929,7 @@ static PyObject *_wrap_BitmapButton_SetBitmapFocus(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_BitmapButton_SetBitmapSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_SetBitmapSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -1828,7 +1963,7 @@ static PyObject *_wrap_BitmapButton_SetBitmapSelected(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_BitmapButton_SetBitmapLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_SetBitmapLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -1862,7 +1997,7 @@ static PyObject *_wrap_BitmapButton_SetBitmapLabel(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_BitmapButton_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     int arg2 ;
@@ -1877,9 +2012,9 @@ static PyObject *_wrap_BitmapButton_SetMargins(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BitmapButton_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmapButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1895,7 +2030,7 @@ static PyObject *_wrap_BitmapButton_SetMargins(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_BitmapButton_GetMarginX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_GetMarginX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     int result;
@@ -1914,14 +2049,14 @@ static PyObject *_wrap_BitmapButton_GetMarginX(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BitmapButton_GetMarginY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapButton_GetMarginY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapButton *arg1 = (wxBitmapButton *) 0 ;
     int result;
@@ -1940,21 +2075,21 @@ static PyObject *_wrap_BitmapButton_GetMarginY(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * BitmapButton_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BitmapButton_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBitmapButton, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_CheckBoxNameStr_set(PyObject *_val) {
+static int _wrap_CheckBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable CheckBoxNameStr is read-only.");
     return 1;
 }
@@ -1974,7 +2109,7 @@ static PyObject *_wrap_CheckBoxNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CheckBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -2010,7 +2145,7 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -2033,7 +2168,7 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -2083,7 +2218,7 @@ static PyObject *_wrap_new_CheckBox(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreCheckBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreCheckBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *result;
     char *kwnames[] = {
@@ -2106,7 +2241,7 @@ static PyObject *_wrap_new_PreCheckBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -2146,7 +2281,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -2169,7 +2304,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -2220,7 +2355,7 @@ static PyObject *_wrap_CheckBox_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_CheckBox_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     bool result;
@@ -2248,7 +2383,7 @@ static PyObject *_wrap_CheckBox_GetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_CheckBox_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     bool result;
@@ -2276,7 +2411,7 @@ static PyObject *_wrap_CheckBox_IsChecked(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_CheckBox_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     bool arg2 ;
@@ -2289,7 +2424,7 @@ static PyObject *_wrap_CheckBox_SetValue(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckBox_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCheckBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool const) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2305,7 +2440,7 @@ static PyObject *_wrap_CheckBox_SetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_CheckBox_Get3StateValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_Get3StateValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     int result;
@@ -2324,14 +2459,14 @@ static PyObject *_wrap_CheckBox_Get3StateValue(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CheckBox_Set3StateValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_Set3StateValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     int arg2 ;
@@ -2344,7 +2479,7 @@ static PyObject *_wrap_CheckBox_Set3StateValue(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckBox_Set3StateValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCheckBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxCheckBoxState) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2360,7 +2495,7 @@ static PyObject *_wrap_CheckBox_Set3StateValue(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_CheckBox_Is3State(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_Is3State(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     bool result;
@@ -2388,7 +2523,7 @@ static PyObject *_wrap_CheckBox_Is3State(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckBox *arg1 = (wxCheckBox *) 0 ;
     bool result;
@@ -2416,7 +2551,7 @@ static PyObject *_wrap_CheckBox_Is3rdStateAllowedForUser(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_CheckBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckBox_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -2427,7 +2562,7 @@ static PyObject *_wrap_CheckBox_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:CheckBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2449,14 +2584,14 @@ static PyObject *_wrap_CheckBox_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * CheckBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CheckBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCheckBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ChoiceNameStr_set(PyObject *_val) {
+static int _wrap_ChoiceNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ChoiceNameStr is read-only.");
     return 1;
 }
@@ -2476,7 +2611,7 @@ static PyObject *_wrap_ChoiceNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Choice(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -2512,7 +2647,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -2551,7 +2686,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -2599,7 +2734,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreChoice(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChoice *result;
     char *kwnames[] = {
@@ -2622,7 +2757,7 @@ static PyObject *_wrap_new_PreChoice(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Choice_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChoice *arg1 = (wxChoice *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -2662,7 +2797,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -2701,7 +2836,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -2750,7 +2885,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Choice_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChoice *arg1 = (wxChoice *) 0 ;
     int arg2 ;
@@ -2763,7 +2898,7 @@ static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Choice_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxChoice,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int const) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2779,7 +2914,7 @@ static PyObject *_wrap_Choice_SetSelection(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Choice_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Choice_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChoice *arg1 = (wxChoice *) 0 ;
     wxString *arg2 = 0 ;
@@ -2823,7 +2958,7 @@ static PyObject *_wrap_Choice_SetStringSelection(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Choice_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChoice *arg1 = (wxChoice *) 0 ;
     int arg2 ;
@@ -2839,7 +2974,7 @@ static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Choice_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxChoice,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -2868,7 +3003,7 @@ static PyObject *_wrap_Choice_SetString(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Choice_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Choice_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -2879,7 +3014,7 @@ static PyObject *_wrap_Choice_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Choice_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2901,14 +3036,14 @@ static PyObject *_wrap_Choice_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Choice_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Choice_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxChoice, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ComboBoxNameStr_set(PyObject *_val) {
+static int _wrap_ComboBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ComboBoxNameStr is read-only.");
     return 1;
 }
@@ -2928,7 +3063,7 @@ static PyObject *_wrap_ComboBoxNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ComboBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -2968,7 +3103,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -3014,7 +3149,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -3070,7 +3205,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreComboBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreComboBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *result;
     char *kwnames[] = {
@@ -3093,7 +3228,7 @@ static PyObject *_wrap_new_PreComboBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -3137,7 +3272,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -3183,7 +3318,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj7) {
-        arg8 = (long) SWIG_AsLong(obj7); 
+        arg8 = (long)SWIG_As_long(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
@@ -3240,7 +3375,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ComboBox_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     wxString result;
@@ -3272,7 +3407,7 @@ static PyObject *_wrap_ComboBox_GetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ComboBox_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -3313,7 +3448,7 @@ static PyObject *_wrap_ComboBox_SetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ComboBox_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3338,7 +3473,7 @@ static PyObject *_wrap_ComboBox_Copy(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_ComboBox_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_Cut(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3363,7 +3498,7 @@ static PyObject *_wrap_ComboBox_Cut(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_ComboBox_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_Paste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3388,7 +3523,7 @@ static PyObject *_wrap_ComboBox_Paste(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ComboBox_SetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetInsertionPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     long arg2 ;
@@ -3401,7 +3536,7 @@ static PyObject *_wrap_ComboBox_SetInsertionPoint(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetInsertionPoint",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3417,7 +3552,7 @@ static PyObject *_wrap_ComboBox_SetInsertionPoint(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ComboBox_GetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_GetInsertionPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     long result;
@@ -3436,14 +3571,14 @@ static PyObject *_wrap_ComboBox_GetInsertionPoint(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ComboBox_GetLastPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_GetLastPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     long result;
@@ -3462,14 +3597,14 @@ static PyObject *_wrap_ComboBox_GetLastPosition(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     long arg2 ;
@@ -3487,9 +3622,9 @@ static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ComboBox_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -3518,7 +3653,7 @@ static PyObject *_wrap_ComboBox_Replace(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ComboBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     int arg2 ;
@@ -3531,7 +3666,7 @@ static PyObject *_wrap_ComboBox_SetSelection(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3547,7 +3682,7 @@ static PyObject *_wrap_ComboBox_SetSelection(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ComboBox_SetMark(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetMark(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     long arg2 ;
@@ -3562,9 +3697,9 @@ static PyObject *_wrap_ComboBox_SetMark(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetMark",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3580,7 +3715,7 @@ static PyObject *_wrap_ComboBox_SetMark(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ComboBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -3624,7 +3759,7 @@ static PyObject *_wrap_ComboBox_SetStringSelection(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ComboBox_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     int arg2 ;
@@ -3640,7 +3775,7 @@ static PyObject *_wrap_ComboBox_SetString(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -3669,7 +3804,7 @@ static PyObject *_wrap_ComboBox_SetString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ComboBox_SetEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetEditable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     bool arg2 ;
@@ -3682,7 +3817,7 @@ static PyObject *_wrap_ComboBox_SetEditable(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ComboBox_SetEditable",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3698,7 +3833,7 @@ static PyObject *_wrap_ComboBox_SetEditable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_SetInsertionPointEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3723,7 +3858,7 @@ static PyObject *_wrap_ComboBox_SetInsertionPointEnd(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ComboBox_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxComboBox *arg1 = (wxComboBox *) 0 ;
     long arg2 ;
@@ -3738,9 +3873,9 @@ static PyObject *_wrap_ComboBox_Remove(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_Remove",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxComboBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3756,7 +3891,7 @@ static PyObject *_wrap_ComboBox_Remove(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ComboBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ComboBox_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -3767,7 +3902,7 @@ static PyObject *_wrap_ComboBox_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ComboBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3789,14 +3924,14 @@ static PyObject *_wrap_ComboBox_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * ComboBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ComboBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxComboBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_GaugeNameStr_set(PyObject *_val) {
+static int _wrap_GaugeNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GaugeNameStr is read-only.");
     return 1;
 }
@@ -3816,7 +3951,7 @@ static PyObject *_wrap_GaugeNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Gauge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -3850,11 +3985,11 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -3870,7 +4005,7 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -3912,7 +4047,7 @@ static PyObject *_wrap_new_Gauge(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_new_PreGauge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreGauge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *result;
     char *kwnames[] = {
@@ -3935,7 +4070,7 @@ static PyObject *_wrap_new_PreGauge(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -3973,11 +4108,11 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -3993,7 +4128,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -4036,7 +4171,7 @@ static PyObject *_wrap_Gauge_Create(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Gauge_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_SetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int arg2 ;
@@ -4049,7 +4184,7 @@ static PyObject *_wrap_Gauge_SetRange(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetRange",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGauge,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4065,7 +4200,7 @@ static PyObject *_wrap_Gauge_SetRange(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Gauge_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_GetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int result;
@@ -4084,14 +4219,14 @@ static PyObject *_wrap_Gauge_GetRange(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Gauge_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int arg2 ;
@@ -4104,7 +4239,7 @@ static PyObject *_wrap_Gauge_SetValue(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGauge,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4120,7 +4255,7 @@ static PyObject *_wrap_Gauge_SetValue(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Gauge_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int result;
@@ -4139,14 +4274,14 @@ static PyObject *_wrap_Gauge_GetValue(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Gauge_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     bool result;
@@ -4174,7 +4309,7 @@ static PyObject *_wrap_Gauge_IsVertical(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Gauge_SetShadowWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_SetShadowWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int arg2 ;
@@ -4187,7 +4322,7 @@ static PyObject *_wrap_Gauge_SetShadowWidth(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetShadowWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGauge,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4203,7 +4338,7 @@ static PyObject *_wrap_Gauge_SetShadowWidth(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Gauge_GetShadowWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_GetShadowWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int result;
@@ -4222,14 +4357,14 @@ static PyObject *_wrap_Gauge_GetShadowWidth(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Gauge_SetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_SetBezelFace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int arg2 ;
@@ -4242,7 +4377,7 @@ static PyObject *_wrap_Gauge_SetBezelFace(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Gauge_SetBezelFace",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGauge,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4258,7 +4393,7 @@ static PyObject *_wrap_Gauge_SetBezelFace(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Gauge_GetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_GetBezelFace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGauge *arg1 = (wxGauge *) 0 ;
     int result;
@@ -4277,14 +4412,14 @@ static PyObject *_wrap_Gauge_GetBezelFace(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Gauge_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Gauge_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -4295,7 +4430,7 @@ static PyObject *_wrap_Gauge_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Gauge_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4317,14 +4452,14 @@ static PyObject *_wrap_Gauge_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Gauge_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Gauge_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGauge, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_StaticBitmapNameStr_set(PyObject *_val) {
+static int _wrap_StaticBitmapNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable StaticBitmapNameStr is read-only.");
     return 1;
 }
@@ -4344,7 +4479,7 @@ static PyObject *_wrap_StaticBitmapNameStr_get() {
 }
 
 
-static int _wrap_StaticBoxNameStr_set(PyObject *_val) {
+static int _wrap_StaticBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable StaticBoxNameStr is read-only.");
     return 1;
 }
@@ -4364,7 +4499,7 @@ static PyObject *_wrap_StaticBoxNameStr_get() {
 }
 
 
-static int _wrap_StaticTextNameStr_set(PyObject *_val) {
+static int _wrap_StaticTextNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable StaticTextNameStr is read-only.");
     return 1;
 }
@@ -4384,7 +4519,7 @@ static PyObject *_wrap_StaticTextNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StaticBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -4417,7 +4552,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -4440,7 +4575,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -4481,7 +4616,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreStaticBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBox *result;
     char *kwnames[] = {
@@ -4504,7 +4639,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBox *arg1 = (wxStaticBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -4541,7 +4676,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -4564,7 +4699,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -4606,7 +4741,7 @@ static PyObject *_wrap_StaticBox_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StaticBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBox_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -4617,7 +4752,7 @@ static PyObject *_wrap_StaticBox_GetClassDefaultAttributes(PyObject *self, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:StaticBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4639,14 +4774,14 @@ static PyObject *_wrap_StaticBox_GetClassDefaultAttributes(PyObject *self, PyObj
 }
 
 
-static PyObject * StaticBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StaticBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStaticBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StaticLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -4675,7 +4810,7 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -4691,7 +4826,7 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -4724,7 +4859,7 @@ static PyObject *_wrap_new_StaticLine(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_PreStaticLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreStaticLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticLine *result;
     char *kwnames[] = {
@@ -4747,7 +4882,7 @@ static PyObject *_wrap_new_PreStaticLine(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticLine_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticLine *arg1 = (wxStaticLine *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -4780,7 +4915,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -4796,7 +4931,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -4830,7 +4965,7 @@ static PyObject *_wrap_StaticLine_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_StaticLine_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticLine_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticLine *arg1 = (wxStaticLine *) 0 ;
     bool result;
@@ -4858,7 +4993,7 @@ static PyObject *_wrap_StaticLine_IsVertical(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StaticLine_GetDefaultSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticLine_GetDefaultSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -4873,14 +5008,14 @@ static PyObject *_wrap_StaticLine_GetDefaultSize(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StaticLine_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticLine_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -4891,7 +5026,7 @@ static PyObject *_wrap_StaticLine_GetClassDefaultAttributes(PyObject *self, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:StaticLine_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4913,14 +5048,14 @@ static PyObject *_wrap_StaticLine_GetClassDefaultAttributes(PyObject *self, PyOb
 }
 
 
-static PyObject * StaticLine_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StaticLine_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStaticLine, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StaticText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -4953,7 +5088,7 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -4976,7 +5111,7 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -5017,7 +5152,7 @@ static PyObject *_wrap_new_StaticText(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_PreStaticText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreStaticText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticText *result;
     char *kwnames[] = {
@@ -5040,7 +5175,7 @@ static PyObject *_wrap_new_PreStaticText(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticText_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticText *arg1 = (wxStaticText *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5077,7 +5212,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -5100,7 +5235,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -5142,7 +5277,7 @@ static PyObject *_wrap_StaticText_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -5153,7 +5288,7 @@ static PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *self, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:StaticText_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5175,14 +5310,14 @@ static PyObject *_wrap_StaticText_GetClassDefaultAttributes(PyObject *self, PyOb
 }
 
 
-static PyObject * StaticText_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StaticText_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStaticText, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StaticBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -5214,7 +5349,7 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -5239,7 +5374,7 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -5272,7 +5407,7 @@ static PyObject *_wrap_new_StaticBitmap(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreStaticBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreStaticBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBitmap *result;
     char *kwnames[] = {
@@ -5295,7 +5430,7 @@ static PyObject *_wrap_new_PreStaticBitmap(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBitmap_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBitmap *arg1 = (wxStaticBitmap *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5331,7 +5466,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -5356,7 +5491,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -5390,7 +5525,7 @@ static PyObject *_wrap_StaticBitmap_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_StaticBitmap_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBitmap_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBitmap *arg1 = (wxStaticBitmap *) 0 ;
     wxBitmap result;
@@ -5420,7 +5555,7 @@ static PyObject *_wrap_StaticBitmap_GetBitmap(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StaticBitmap_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBitmap_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBitmap *arg1 = (wxStaticBitmap *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -5454,7 +5589,7 @@ static PyObject *_wrap_StaticBitmap_SetBitmap(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StaticBitmap_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBitmap_SetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBitmap *arg1 = (wxStaticBitmap *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -5488,7 +5623,7 @@ static PyObject *_wrap_StaticBitmap_SetIcon(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_StaticBitmap_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBitmap_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -5499,7 +5634,7 @@ static PyObject *_wrap_StaticBitmap_GetClassDefaultAttributes(PyObject *self, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:StaticBitmap_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5521,14 +5656,14 @@ static PyObject *_wrap_StaticBitmap_GetClassDefaultAttributes(PyObject *self, Py
 }
 
 
-static PyObject * StaticBitmap_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StaticBitmap_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStaticBitmap, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ListBoxNameStr_set(PyObject *_val) {
+static int _wrap_ListBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ListBoxNameStr is read-only.");
     return 1;
 }
@@ -5548,7 +5683,7 @@ static PyObject *_wrap_ListBoxNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -5584,7 +5719,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -5623,7 +5758,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -5671,7 +5806,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_PreListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *result;
     char *kwnames[] = {
@@ -5694,7 +5829,7 @@ static PyObject *_wrap_new_PreListBox(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5734,7 +5869,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -5773,7 +5908,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -5822,7 +5957,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -5845,7 +5980,7 @@ static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject *
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         arg4 = obj3;
@@ -5872,7 +6007,7 @@ static PyObject *_wrap_ListBox_Insert(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_InsertItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxArrayString *arg2 = 0 ;
@@ -5909,7 +6044,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
             Py_DECREF(str);
         }
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5931,7 +6066,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxArrayString *arg2 = 0 ;
@@ -5986,7 +6121,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_IsSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6000,7 +6135,7 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6018,7 +6153,7 @@ static PyObject *_wrap_ListBox_IsSelected(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6033,10 +6168,10 @@ static PyObject *_wrap_ListBox_SetSelection(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListBox_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6053,7 +6188,7 @@ static PyObject *_wrap_ListBox_SetSelection(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListBox_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6066,7 +6201,7 @@ static PyObject *_wrap_ListBox_Select(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_Select",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6082,7 +6217,7 @@ static PyObject *_wrap_ListBox_Select(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListBox_Deselect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_Deselect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6095,7 +6230,7 @@ static PyObject *_wrap_ListBox_Deselect(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_Deselect",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6111,7 +6246,7 @@ static PyObject *_wrap_ListBox_Deselect(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListBox_DeselectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_DeselectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 = (int) -1 ;
@@ -6125,7 +6260,7 @@ static PyObject *_wrap_ListBox_DeselectAll(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6142,7 +6277,7 @@ static PyObject *_wrap_ListBox_DeselectAll(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -6165,7 +6300,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6192,7 +6327,7 @@ static PyObject *_wrap_ListBox_SetStringSelection(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ListBox_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_GetSelections(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     PyObject *result;
@@ -6218,7 +6353,7 @@ static PyObject *_wrap_ListBox_GetSelections(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListBox_SetFirstItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetFirstItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6231,7 +6366,7 @@ static PyObject *_wrap_ListBox_SetFirstItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_SetFirstItem",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6247,7 +6382,7 @@ static PyObject *_wrap_ListBox_SetFirstItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListBox_SetFirstItemStr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetFirstItemStr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -6288,7 +6423,7 @@ static PyObject *_wrap_ListBox_SetFirstItemStr(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListBox_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_EnsureVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6301,7 +6436,7 @@ static PyObject *_wrap_ListBox_EnsureVisible(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListBox_EnsureVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6317,7 +6452,7 @@ static PyObject *_wrap_ListBox_EnsureVisible(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListBox_AppendAndEnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_AppendAndEnsureVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -6358,7 +6493,7 @@ static PyObject *_wrap_ListBox_AppendAndEnsureVisible(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_IsSorted(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     bool result;
@@ -6386,7 +6521,7 @@ static PyObject *_wrap_ListBox_IsSorted(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListBox_SetItemForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetItemForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6402,7 +6537,7 @@ static PyObject *_wrap_ListBox_SetItemForegroundColour(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemForegroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -6422,7 +6557,7 @@ static PyObject *_wrap_ListBox_SetItemForegroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListBox_SetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6438,7 +6573,7 @@ static PyObject *_wrap_ListBox_SetItemBackgroundColour(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -6458,7 +6593,7 @@ static PyObject *_wrap_ListBox_SetItemBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_SetItemFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListBox *arg1 = (wxListBox *) 0 ;
     int arg2 ;
@@ -6473,7 +6608,7 @@ static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListBox_SetItemFont",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxFont,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -6496,7 +6631,7 @@ static PyObject *_wrap_ListBox_SetItemFont(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListBox_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -6507,7 +6642,7 @@ static PyObject *_wrap_ListBox_GetClassDefaultAttributes(PyObject *self, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ListBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6529,14 +6664,14 @@ static PyObject *_wrap_ListBox_GetClassDefaultAttributes(PyObject *self, PyObjec
 }
 
 
-static PyObject * ListBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CheckListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -6572,7 +6707,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -6611,7 +6746,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -6659,7 +6794,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreCheckListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreCheckListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *result;
     char *kwnames[] = {
@@ -6682,7 +6817,7 @@ static PyObject *_wrap_new_PreCheckListBox(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckListBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -6722,7 +6857,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -6761,7 +6896,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -6810,7 +6945,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckListBox_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     int arg2 ;
@@ -6824,7 +6959,7 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CheckListBox_IsChecked",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCheckListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6842,7 +6977,7 @@ static PyObject *_wrap_CheckListBox_IsChecked(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_CheckListBox_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckListBox_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     int arg2 ;
@@ -6857,10 +6992,10 @@ static PyObject *_wrap_CheckListBox_Check(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:CheckListBox_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCheckListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6877,7 +7012,7 @@ static PyObject *_wrap_CheckListBox_Check(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_CheckListBox_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckListBox_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -6903,14 +7038,14 @@ static PyObject *_wrap_CheckListBox_HitTest(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCheckListBox *arg1 = (wxCheckListBox *) 0 ;
     int arg2 ;
@@ -6926,9 +7061,9 @@ static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CheckListBox_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCheckListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6937,21 +7072,21 @@ static PyObject *_wrap_CheckListBox_HitTestXY(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * CheckListBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CheckListBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCheckListBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_TextCtrlNameStr_set(PyObject *_val) {
+static int _wrap_TextCtrlNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TextCtrlNameStr is read-only.");
     return 1;
 }
@@ -6971,7 +7106,7 @@ static PyObject *_wrap_TextCtrlNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TextAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour const &arg1_defvalue = wxNullColour ;
     wxColour *arg1 = (wxColour *) &arg1_defvalue ;
@@ -7014,7 +7149,7 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj3) {
-        arg4 = (wxTextAttrAlignment) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7031,7 +7166,7 @@ static PyObject *_wrap_new_TextAttr(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_TextAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7056,7 +7191,7 @@ static PyObject *_wrap_delete_TextAttr(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_Init(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7081,7 +7216,7 @@ static PyObject *_wrap_TextAttr_Init(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TextAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -7113,7 +7248,7 @@ static PyObject *_wrap_TextAttr_SetTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TextAttr_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -7145,7 +7280,7 @@ static PyObject *_wrap_TextAttr_SetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TextAttr_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxFont *arg2 = 0 ;
@@ -7168,7 +7303,7 @@ static PyObject *_wrap_TextAttr_SetFont(PyObject *self, PyObject *args, PyObject
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7185,7 +7320,7 @@ static PyObject *_wrap_TextAttr_SetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     int arg2 ;
@@ -7198,7 +7333,7 @@ static PyObject *_wrap_TextAttr_SetAlignment(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetAlignment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxTextAttrAlignment) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7214,7 +7349,7 @@ static PyObject *_wrap_TextAttr_SetAlignment(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetTabs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxArrayInt *arg2 = 0 ;
@@ -7264,7 +7399,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_SetLeftIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetLeftIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     int arg2 ;
@@ -7279,10 +7414,10 @@ static PyObject *_wrap_TextAttr_SetLeftIndent(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TextAttr_SetLeftIndent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7299,7 +7434,7 @@ static PyObject *_wrap_TextAttr_SetLeftIndent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TextAttr_SetRightIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetRightIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     int arg2 ;
@@ -7312,7 +7447,7 @@ static PyObject *_wrap_TextAttr_SetRightIndent(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetRightIndent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7328,7 +7463,7 @@ static PyObject *_wrap_TextAttr_SetRightIndent(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TextAttr_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     long arg2 ;
@@ -7341,7 +7476,7 @@ static PyObject *_wrap_TextAttr_SetFlags(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7357,7 +7492,7 @@ static PyObject *_wrap_TextAttr_SetFlags(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7385,7 +7520,7 @@ static PyObject *_wrap_TextAttr_HasTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7413,7 +7548,7 @@ static PyObject *_wrap_TextAttr_HasBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TextAttr_HasFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7441,7 +7576,7 @@ static PyObject *_wrap_TextAttr_HasFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_HasAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7469,7 +7604,7 @@ static PyObject *_wrap_TextAttr_HasAlignment(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextAttr_HasTabs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasTabs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7497,7 +7632,7 @@ static PyObject *_wrap_TextAttr_HasTabs(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7525,7 +7660,7 @@ static PyObject *_wrap_TextAttr_HasLeftIndent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7553,7 +7688,7 @@ static PyObject *_wrap_TextAttr_HasRightIndent(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_HasFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     long arg2 ;
@@ -7567,7 +7702,7 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_HasFlag",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7585,7 +7720,7 @@ static PyObject *_wrap_TextAttr_HasFlag(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxColour *result;
@@ -7614,7 +7749,7 @@ static PyObject *_wrap_TextAttr_GetTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TextAttr_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxColour *result;
@@ -7643,7 +7778,7 @@ static PyObject *_wrap_TextAttr_GetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TextAttr_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxFont *result;
@@ -7675,7 +7810,7 @@ static PyObject *_wrap_TextAttr_GetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     int result;
@@ -7694,14 +7829,14 @@ static PyObject *_wrap_TextAttr_GetAlignment(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextAttr_GetTabs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetTabs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     wxArrayInt *result;
@@ -7738,7 +7873,7 @@ static PyObject *_wrap_TextAttr_GetTabs(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextAttr_GetLeftIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetLeftIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     long result;
@@ -7757,14 +7892,14 @@ static PyObject *_wrap_TextAttr_GetLeftIndent(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextAttr_GetLeftSubIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetLeftSubIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     long result;
@@ -7783,14 +7918,14 @@ static PyObject *_wrap_TextAttr_GetLeftSubIndent(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextAttr_GetRightIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetRightIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     long result;
@@ -7809,14 +7944,14 @@ static PyObject *_wrap_TextAttr_GetRightIndent(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextAttr_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     long result;
@@ -7835,14 +7970,14 @@ static PyObject *_wrap_TextAttr_GetFlags(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextAttr_IsDefault(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_IsDefault(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = (wxTextAttr *) 0 ;
     bool result;
@@ -7870,7 +8005,7 @@ static PyObject *_wrap_TextAttr_IsDefault(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextAttr_Combine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextAttr_Combine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextAttr *arg1 = 0 ;
     wxTextAttr *arg2 = 0 ;
@@ -7918,14 +8053,14 @@ static PyObject *_wrap_TextAttr_Combine(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * TextAttr_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TextAttr_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTextAttr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TextCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -7961,7 +8096,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -7984,7 +8119,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -8034,7 +8169,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreTextCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *result;
     char *kwnames[] = {
@@ -8057,7 +8192,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -8097,7 +8232,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -8120,7 +8255,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -8171,7 +8306,7 @@ static PyObject *_wrap_TextCtrl_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString result;
@@ -8203,7 +8338,7 @@ static PyObject *_wrap_TextCtrl_GetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -8244,7 +8379,7 @@ static PyObject *_wrap_TextCtrl_SetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -8260,9 +8395,9 @@ static PyObject *_wrap_TextCtrl_GetRange(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8284,7 +8419,7 @@ static PyObject *_wrap_TextCtrl_GetRange(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -8298,7 +8433,7 @@ static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_GetLineLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8307,14 +8442,14 @@ static PyObject *_wrap_TextCtrl_GetLineLength(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_GetLineText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetLineText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -8328,7 +8463,7 @@ static PyObject *_wrap_TextCtrl_GetLineText(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_GetLineText",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8350,7 +8485,7 @@ static PyObject *_wrap_TextCtrl_GetLineText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TextCtrl_GetNumberOfLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetNumberOfLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     int result;
@@ -8369,14 +8504,14 @@ static PyObject *_wrap_TextCtrl_GetNumberOfLines(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_IsModified(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_IsModified(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -8404,7 +8539,7 @@ static PyObject *_wrap_TextCtrl_IsModified(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TextCtrl_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_IsEditable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -8432,7 +8567,7 @@ static PyObject *_wrap_TextCtrl_IsEditable(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -8460,7 +8595,7 @@ static PyObject *_wrap_TextCtrl_IsSingleLine(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -8488,20 +8623,22 @@ static PyObject *_wrap_TextCtrl_IsMultiLine(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TextCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long *arg2 = (long *) 0 ;
     long *arg3 = (long *) 0 ;
     long temp2 ;
+    int res2 = 0 ;
     long temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextCtrl_GetSelection",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -8513,21 +8650,17 @@ static PyObject *_wrap_TextCtrl_GetSelection(PyObject *self, PyObject *args, PyO
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString result;
@@ -8559,7 +8692,7 @@ static PyObject *_wrap_TextCtrl_GetStringSelection(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TextCtrl_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8584,7 +8717,7 @@ static PyObject *_wrap_TextCtrl_Clear(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -8602,9 +8735,9 @@ static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -8633,7 +8766,7 @@ static PyObject *_wrap_TextCtrl_Replace(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -8648,9 +8781,9 @@ static PyObject *_wrap_TextCtrl_Remove(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_Remove",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8666,7 +8799,7 @@ static PyObject *_wrap_TextCtrl_Remove(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -8710,7 +8843,7 @@ static PyObject *_wrap_TextCtrl_LoadFile(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SaveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -8757,7 +8890,7 @@ static PyObject *_wrap_TextCtrl_SaveFile(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_MarkDirty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_MarkDirty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8782,7 +8915,7 @@ static PyObject *_wrap_TextCtrl_MarkDirty(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextCtrl_DiscardEdits(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_DiscardEdits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8807,7 +8940,7 @@ static PyObject *_wrap_TextCtrl_DiscardEdits(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     unsigned long arg2 ;
@@ -8820,7 +8953,7 @@ static PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetMaxLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (unsigned long)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8836,7 +8969,7 @@ static PyObject *_wrap_TextCtrl_SetMaxLength(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextCtrl_WriteText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_WriteText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -8877,7 +9010,7 @@ static PyObject *_wrap_TextCtrl_WriteText(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextCtrl_AppendText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_AppendText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -8918,7 +9051,7 @@ static PyObject *_wrap_TextCtrl_AppendText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -8955,7 +9088,7 @@ static PyObject *_wrap_TextCtrl_EmulateKeyPress(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -8973,9 +9106,9 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_SetStyle",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -9000,7 +9133,7 @@ static PyObject *_wrap_TextCtrl_SetStyle(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -9016,7 +9149,7 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetStyle",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxTextAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -9041,7 +9174,7 @@ static PyObject *_wrap_TextCtrl_GetStyle(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxTextAttr *arg2 = 0 ;
@@ -9078,7 +9211,7 @@ static PyObject *_wrap_TextCtrl_SetDefaultStyle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TextCtrl_GetDefaultStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetDefaultStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxTextAttr *result;
@@ -9107,7 +9240,7 @@ static PyObject *_wrap_TextCtrl_GetDefaultStyle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -9123,9 +9256,9 @@ static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_XYToPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9134,33 +9267,35 @@ static PyObject *_wrap_TextCtrl_XYToPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_PositionToXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_PositionToXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
     long *arg3 = (long *) 0 ;
     long *arg4 = (long *) 0 ;
     long temp3 ;
+    int res3 = 0 ;
     long temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "pos", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_PositionToXY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9170,21 +9305,17 @@ static PyObject *_wrap_TextCtrl_PositionToXY(PyObject *self, PyObject *args, PyO
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -9197,7 +9328,7 @@ static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_ShowPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9213,7 +9344,7 @@ static PyObject *_wrap_TextCtrl_ShowPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -9222,15 +9353,17 @@ static PyObject *_wrap_TextCtrl_HitTest(PyObject *self, PyObject *args, PyObject
     int result;
     wxPoint temp2 ;
     long temp3 ;
+    int res3 = 0 ;
     long temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "pt", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_HitTest",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -9245,22 +9378,18 @@ static PyObject *_wrap_TextCtrl_HitTest(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = SWIG_From_int((int)result);
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_HitTestPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_HitTestPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -9268,13 +9397,14 @@ static PyObject *_wrap_TextCtrl_HitTestPos(PyObject *self, PyObject *args, PyObj
     int result;
     wxPoint temp2 ;
     long temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "pt", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_HitTestPos",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -9289,18 +9419,16 @@ static PyObject *_wrap_TextCtrl_HitTestPos(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = SWIG_From_int((int)result);
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9325,7 +9453,7 @@ static PyObject *_wrap_TextCtrl_Copy(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TextCtrl_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Cut(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9350,7 +9478,7 @@ static PyObject *_wrap_TextCtrl_Cut(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_TextCtrl_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Paste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9375,7 +9503,7 @@ static PyObject *_wrap_TextCtrl_Paste(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_TextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_CanCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -9403,7 +9531,7 @@ static PyObject *_wrap_TextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_CanCut(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_CanCut(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -9431,7 +9559,7 @@ static PyObject *_wrap_TextCtrl_CanCut(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_CanPaste(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_CanPaste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -9459,7 +9587,7 @@ static PyObject *_wrap_TextCtrl_CanPaste(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TextCtrl_Undo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Undo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9484,7 +9612,7 @@ static PyObject *_wrap_TextCtrl_Undo(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TextCtrl_Redo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_Redo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9509,7 +9637,7 @@ static PyObject *_wrap_TextCtrl_Redo(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_CanUndo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -9537,7 +9665,7 @@ static PyObject *_wrap_TextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_CanRedo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool result;
@@ -9565,7 +9693,7 @@ static PyObject *_wrap_TextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextCtrl_SetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetInsertionPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -9578,7 +9706,7 @@ static PyObject *_wrap_TextCtrl_SetInsertionPoint(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetInsertionPoint",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9594,7 +9722,7 @@ static PyObject *_wrap_TextCtrl_SetInsertionPoint(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetInsertionPointEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9619,7 +9747,7 @@ static PyObject *_wrap_TextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TextCtrl_GetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetInsertionPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long result;
@@ -9638,14 +9766,14 @@ static PyObject *_wrap_TextCtrl_GetInsertionPoint(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_GetLastPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetLastPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long result;
@@ -9664,14 +9792,14 @@ static PyObject *_wrap_TextCtrl_GetLastPosition(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -9686,9 +9814,9 @@ static PyObject *_wrap_TextCtrl_SetSelection(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9704,7 +9832,7 @@ static PyObject *_wrap_TextCtrl_SetSelection(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TextCtrl_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9729,7 +9857,7 @@ static PyObject *_wrap_TextCtrl_SelectAll(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextCtrl_SetEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_SetEditable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     bool arg2 ;
@@ -9742,7 +9870,7 @@ static PyObject *_wrap_TextCtrl_SetEditable(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextCtrl_SetEditable",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9758,7 +9886,7 @@ static PyObject *_wrap_TextCtrl_SetEditable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TextCtrl_write(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_write(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -9799,7 +9927,7 @@ static PyObject *_wrap_TextCtrl_write(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_TextCtrl_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     long arg2 ;
@@ -9815,9 +9943,9 @@ static PyObject *_wrap_TextCtrl_GetString(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTextCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9839,7 +9967,7 @@ static PyObject *_wrap_TextCtrl_GetString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -9850,7 +9978,7 @@ static PyObject *_wrap_TextCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:TextCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9872,14 +10000,14 @@ static PyObject *_wrap_TextCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * TextCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTextCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TextUrlEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TextUrlEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxMouseEvent *arg2 = 0 ;
@@ -9895,7 +10023,7 @@ static PyObject *_wrap_new_TextUrlEvent(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_TextUrlEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -9904,9 +10032,9 @@ static PyObject *_wrap_new_TextUrlEvent(PyObject *self, PyObject *args, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (long) SWIG_AsLong(obj3); 
+    arg4 = (long)SWIG_As_long(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9922,7 +10050,7 @@ static PyObject *_wrap_new_TextUrlEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TextUrlEvent_GetMouseEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextUrlEvent_GetMouseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextUrlEvent *arg1 = (wxTextUrlEvent *) 0 ;
     wxMouseEvent *result;
@@ -9951,7 +10079,7 @@ static PyObject *_wrap_TextUrlEvent_GetMouseEvent(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TextUrlEvent_GetURLStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextUrlEvent_GetURLStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextUrlEvent *arg1 = (wxTextUrlEvent *) 0 ;
     long result;
@@ -9970,14 +10098,14 @@ static PyObject *_wrap_TextUrlEvent_GetURLStart(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextUrlEvent_GetURLEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextUrlEvent_GetURLEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextUrlEvent *arg1 = (wxTextUrlEvent *) 0 ;
     long result;
@@ -9996,21 +10124,21 @@ static PyObject *_wrap_TextUrlEvent_GetURLEnd(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * TextUrlEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TextUrlEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTextUrlEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ScrollBarNameStr_set(PyObject *_val) {
+static int _wrap_ScrollBarNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ScrollBarNameStr is read-only.");
     return 1;
 }
@@ -10030,7 +10158,7 @@ static PyObject *_wrap_ScrollBarNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -10062,7 +10190,7 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -10078,7 +10206,7 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -10120,7 +10248,7 @@ static PyObject *_wrap_new_ScrollBar(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_PreScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreScrollBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *result;
     char *kwnames[] = {
@@ -10143,7 +10271,7 @@ static PyObject *_wrap_new_PreScrollBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -10179,7 +10307,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -10195,7 +10323,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -10238,7 +10366,7 @@ static PyObject *_wrap_ScrollBar_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ScrollBar_GetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_GetThumbPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     int result;
@@ -10257,14 +10385,14 @@ static PyObject *_wrap_ScrollBar_GetThumbPosition(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollBar_GetThumbSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_GetThumbSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     int result;
@@ -10283,14 +10411,14 @@ static PyObject *_wrap_ScrollBar_GetThumbSize(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollBar_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_GetPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     int result;
@@ -10309,14 +10437,14 @@ static PyObject *_wrap_ScrollBar_GetPageSize(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollBar_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_GetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     int result;
@@ -10335,14 +10463,14 @@ static PyObject *_wrap_ScrollBar_GetRange(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollBar_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     bool result;
@@ -10370,7 +10498,7 @@ static PyObject *_wrap_ScrollBar_IsVertical(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ScrollBar_SetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_SetThumbPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     int arg2 ;
@@ -10383,7 +10511,7 @@ static PyObject *_wrap_ScrollBar_SetThumbPosition(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollBar_SetThumbPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10399,7 +10527,7 @@ static PyObject *_wrap_ScrollBar_SetThumbPosition(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollBar *arg1 = (wxScrollBar *) 0 ;
     int arg2 ;
@@ -10420,16 +10548,16 @@ static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:ScrollBar_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (bool) SWIG_AsBool(obj5); 
+        arg6 = (bool)SWIG_As_bool(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10446,7 +10574,7 @@ static PyObject *_wrap_ScrollBar_SetScrollbar(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ScrollBar_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollBar_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -10457,7 +10585,7 @@ static PyObject *_wrap_ScrollBar_GetClassDefaultAttributes(PyObject *self, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ScrollBar_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10479,14 +10607,14 @@ static PyObject *_wrap_ScrollBar_GetClassDefaultAttributes(PyObject *self, PyObj
 }
 
 
-static PyObject * ScrollBar_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ScrollBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScrollBar, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_SPIN_BUTTON_NAME_set(PyObject *_val) {
+static int _wrap_SPIN_BUTTON_NAME_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SPIN_BUTTON_NAME is read-only.");
     return 1;
 }
@@ -10506,7 +10634,7 @@ static PyObject *_wrap_SPIN_BUTTON_NAME_get() {
 }
 
 
-static int _wrap_SpinCtrlNameStr_set(PyObject *_val) {
+static int _wrap_SpinCtrlNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SpinCtrlNameStr is read-only.");
     return 1;
 }
@@ -10526,7 +10654,7 @@ static PyObject *_wrap_SpinCtrlNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SpinButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -10555,7 +10683,7 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -10571,7 +10699,7 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -10604,7 +10732,7 @@ static PyObject *_wrap_new_SpinButton(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_PreSpinButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSpinButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *result;
     char *kwnames[] = {
@@ -10627,7 +10755,7 @@ static PyObject *_wrap_new_PreSpinButton(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -10660,7 +10788,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -10676,7 +10804,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -10710,7 +10838,7 @@ static PyObject *_wrap_SpinButton_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SpinButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int result;
@@ -10729,14 +10857,14 @@ static PyObject *_wrap_SpinButton_GetValue(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinButton_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_GetMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int result;
@@ -10755,14 +10883,14 @@ static PyObject *_wrap_SpinButton_GetMin(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinButton_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_GetMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int result;
@@ -10781,14 +10909,14 @@ static PyObject *_wrap_SpinButton_GetMax(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int arg2 ;
@@ -10801,7 +10929,7 @@ static PyObject *_wrap_SpinButton_SetValue(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10817,7 +10945,7 @@ static PyObject *_wrap_SpinButton_SetValue(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SpinButton_SetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_SetMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int arg2 ;
@@ -10830,7 +10958,7 @@ static PyObject *_wrap_SpinButton_SetMin(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetMin",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10846,7 +10974,7 @@ static PyObject *_wrap_SpinButton_SetMin(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SpinButton_SetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_SetMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int arg2 ;
@@ -10859,7 +10987,7 @@ static PyObject *_wrap_SpinButton_SetMax(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinButton_SetMax",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10875,7 +11003,7 @@ static PyObject *_wrap_SpinButton_SetMax(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SpinButton_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_SetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     int arg2 ;
@@ -10890,9 +11018,9 @@ static PyObject *_wrap_SpinButton_SetRange(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinButton_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10908,7 +11036,7 @@ static PyObject *_wrap_SpinButton_SetRange(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SpinButton_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinButton *arg1 = (wxSpinButton *) 0 ;
     bool result;
@@ -10936,7 +11064,7 @@ static PyObject *_wrap_SpinButton_IsVertical(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SpinButton_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinButton_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -10947,7 +11075,7 @@ static PyObject *_wrap_SpinButton_GetClassDefaultAttributes(PyObject *self, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SpinButton_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10969,14 +11097,14 @@ static PyObject *_wrap_SpinButton_GetClassDefaultAttributes(PyObject *self, PyOb
 }
 
 
-static PyObject * SpinButton_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SpinButton_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSpinButton, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SpinCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -11015,7 +11143,7 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -11038,19 +11166,19 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (int) SWIG_AsInt(obj8); 
+        arg9 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
@@ -11091,7 +11219,7 @@ static PyObject *_wrap_new_SpinCtrl(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreSpinCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSpinCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *result;
     char *kwnames[] = {
@@ -11114,7 +11242,7 @@ static PyObject *_wrap_new_PreSpinCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -11157,7 +11285,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -11180,19 +11308,19 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (int) SWIG_AsInt(obj8); 
+        arg9 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
-        arg10 = (int) SWIG_AsInt(obj9); 
+        arg10 = (int)SWIG_As_int(obj9); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj10) {
@@ -11234,7 +11362,7 @@ static PyObject *_wrap_SpinCtrl_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_SpinCtrl_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     int result;
@@ -11253,14 +11381,14 @@ static PyObject *_wrap_SpinCtrl_GetValue(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinCtrl_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     int arg2 ;
@@ -11273,7 +11401,7 @@ static PyObject *_wrap_SpinCtrl_SetValue(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinCtrl_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11289,7 +11417,7 @@ static PyObject *_wrap_SpinCtrl_SetValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SpinCtrl_SetValueString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_SetValueString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -11330,7 +11458,7 @@ static PyObject *_wrap_SpinCtrl_SetValueString(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SpinCtrl_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_SetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     int arg2 ;
@@ -11345,9 +11473,9 @@ static PyObject *_wrap_SpinCtrl_SetRange(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11363,7 +11491,7 @@ static PyObject *_wrap_SpinCtrl_SetRange(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SpinCtrl_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_GetMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     int result;
@@ -11382,14 +11510,14 @@ static PyObject *_wrap_SpinCtrl_GetMin(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinCtrl_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_GetMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     int result;
@@ -11408,14 +11536,14 @@ static PyObject *_wrap_SpinCtrl_GetMax(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinCtrl *arg1 = (wxSpinCtrl *) 0 ;
     long arg2 ;
@@ -11430,9 +11558,9 @@ static PyObject *_wrap_SpinCtrl_SetSelection(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11448,7 +11576,7 @@ static PyObject *_wrap_SpinCtrl_SetSelection(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SpinCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -11459,7 +11587,7 @@ static PyObject *_wrap_SpinCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SpinCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11481,14 +11609,14 @@ static PyObject *_wrap_SpinCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * SpinCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SpinCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSpinCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SpinEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SpinEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -11501,11 +11629,11 @@ static PyObject *_wrap_new_SpinEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SpinEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11522,7 +11650,7 @@ static PyObject *_wrap_new_SpinEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_SpinEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinEvent *arg1 = (wxSpinEvent *) 0 ;
     int result;
@@ -11541,14 +11669,14 @@ static PyObject *_wrap_SpinEvent_GetPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SpinEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SpinEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSpinEvent *arg1 = (wxSpinEvent *) 0 ;
     int arg2 ;
@@ -11561,7 +11689,7 @@ static PyObject *_wrap_SpinEvent_SetPosition(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SpinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSpinEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11577,14 +11705,14 @@ static PyObject *_wrap_SpinEvent_SetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * SpinEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SpinEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSpinEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_RadioBoxNameStr_set(PyObject *_val) {
+static int _wrap_RadioBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable RadioBoxNameStr is read-only.");
     return 1;
 }
@@ -11604,7 +11732,7 @@ static PyObject *_wrap_RadioBoxNameStr_get() {
 }
 
 
-static int _wrap_RadioButtonNameStr_set(PyObject *_val) {
+static int _wrap_RadioButtonNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable RadioButtonNameStr is read-only.");
     return 1;
 }
@@ -11624,7 +11752,7 @@ static PyObject *_wrap_RadioButtonNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RadioBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -11666,7 +11794,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -11712,11 +11840,11 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (long) SWIG_AsLong(obj7); 
+        arg8 = (long)SWIG_As_long(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
@@ -11772,7 +11900,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreRadioBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreRadioBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *result;
     char *kwnames[] = {
@@ -11795,7 +11923,7 @@ static PyObject *_wrap_new_PreRadioBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -11841,7 +11969,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -11887,11 +12015,11 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (long) SWIG_AsLong(obj8); 
+        arg9 = (long)SWIG_As_long(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
@@ -11948,7 +12076,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RadioBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
@@ -11961,7 +12089,7 @@ static PyObject *_wrap_RadioBox_SetSelection(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11977,7 +12105,7 @@ static PyObject *_wrap_RadioBox_SetSelection(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_RadioBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int result;
@@ -11996,14 +12124,14 @@ static PyObject *_wrap_RadioBox_GetSelection(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RadioBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxString result;
@@ -12035,7 +12163,7 @@ static PyObject *_wrap_RadioBox_GetStringSelection(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -12079,7 +12207,7 @@ static PyObject *_wrap_RadioBox_SetStringSelection(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_RadioBox_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int result;
@@ -12098,14 +12226,14 @@ static PyObject *_wrap_RadioBox_GetCount(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_FindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     wxString *arg2 = 0 ;
@@ -12132,7 +12260,7 @@ static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -12147,7 +12275,7 @@ static PyObject *_wrap_RadioBox_FindString(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_RadioBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
@@ -12161,7 +12289,7 @@ static PyObject *_wrap_RadioBox_GetString(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_GetString",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12183,7 +12311,7 @@ static PyObject *_wrap_RadioBox_GetString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
@@ -12199,7 +12327,7 @@ static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RadioBox_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -12228,7 +12356,7 @@ static PyObject *_wrap_RadioBox_SetString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_RadioBox_EnableItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_EnableItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
@@ -12243,10 +12371,10 @@ static PyObject *_wrap_RadioBox_EnableItem(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:RadioBox_EnableItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12263,7 +12391,7 @@ static PyObject *_wrap_RadioBox_EnableItem(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_RadioBox_ShowItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_ShowItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
@@ -12278,10 +12406,10 @@ static PyObject *_wrap_RadioBox_ShowItem(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:RadioBox_ShowItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12298,7 +12426,7 @@ static PyObject *_wrap_RadioBox_ShowItem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_RadioBox_GetColumnCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetColumnCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int result;
@@ -12317,14 +12445,14 @@ static PyObject *_wrap_RadioBox_GetColumnCount(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RadioBox_GetRowCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetRowCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int result;
@@ -12343,14 +12471,14 @@ static PyObject *_wrap_RadioBox_GetRowCount(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetNextItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioBox *arg1 = (wxRadioBox *) 0 ;
     int arg2 ;
@@ -12368,11 +12496,11 @@ static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:RadioBox_GetNextItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (wxDirection) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (long) SWIG_AsLong(obj3); 
+    arg4 = (long)SWIG_As_long(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12381,14 +12509,14 @@ static PyObject *_wrap_RadioBox_GetNextItem(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RadioBox_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioBox_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -12399,7 +12527,7 @@ static PyObject *_wrap_RadioBox_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:RadioBox_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12421,14 +12549,14 @@ static PyObject *_wrap_RadioBox_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * RadioBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * RadioBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRadioBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RadioButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -12464,7 +12592,7 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -12487,7 +12615,7 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -12537,7 +12665,7 @@ static PyObject *_wrap_new_RadioButton(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreRadioButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreRadioButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioButton *result;
     char *kwnames[] = {
@@ -12560,7 +12688,7 @@ static PyObject *_wrap_new_PreRadioButton(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioButton_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioButton *arg1 = (wxRadioButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -12600,7 +12728,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -12623,7 +12751,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -12674,7 +12802,7 @@ static PyObject *_wrap_RadioButton_Create(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_RadioButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioButton_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioButton *arg1 = (wxRadioButton *) 0 ;
     bool result;
@@ -12702,7 +12830,7 @@ static PyObject *_wrap_RadioButton_GetValue(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_RadioButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioButton_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRadioButton *arg1 = (wxRadioButton *) 0 ;
     bool arg2 ;
@@ -12715,7 +12843,7 @@ static PyObject *_wrap_RadioButton_SetValue(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioButton_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRadioButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12731,7 +12859,7 @@ static PyObject *_wrap_RadioButton_SetValue(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_RadioButton_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RadioButton_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -12742,7 +12870,7 @@ static PyObject *_wrap_RadioButton_GetClassDefaultAttributes(PyObject *self, PyO
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:RadioButton_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12764,14 +12892,14 @@ static PyObject *_wrap_RadioButton_GetClassDefaultAttributes(PyObject *self, PyO
 }
 
 
-static PyObject * RadioButton_swigregister(PyObject *self, PyObject *args) {
+static PyObject * RadioButton_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRadioButton, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_SliderNameStr_set(PyObject *_val) {
+static int _wrap_SliderNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SliderNameStr is read-only.");
     return 1;
 }
@@ -12791,7 +12919,7 @@ static PyObject *_wrap_SliderNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Slider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -12829,19 +12957,19 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -12857,7 +12985,7 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj7) {
-        arg8 = (long) SWIG_AsLong(obj7); 
+        arg8 = (long)SWIG_As_long(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
@@ -12899,7 +13027,7 @@ static PyObject *_wrap_new_Slider(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreSlider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSlider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *result;
     char *kwnames[] = {
@@ -12922,7 +13050,7 @@ static PyObject *_wrap_new_PreSlider(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -12964,19 +13092,19 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -12992,7 +13120,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj8) {
-        arg9 = (long) SWIG_AsLong(obj8); 
+        arg9 = (long)SWIG_As_long(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
@@ -13035,7 +13163,7 @@ static PyObject *_wrap_Slider_Create(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Slider_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13054,14 +13182,14 @@ static PyObject *_wrap_Slider_GetValue(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13074,7 +13202,7 @@ static PyObject *_wrap_Slider_SetValue(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13090,7 +13218,7 @@ static PyObject *_wrap_Slider_SetValue(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Slider_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13105,9 +13233,9 @@ static PyObject *_wrap_Slider_SetRange(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Slider_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13123,7 +13251,7 @@ static PyObject *_wrap_Slider_SetRange(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Slider_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13142,14 +13270,14 @@ static PyObject *_wrap_Slider_GetMin(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13168,14 +13296,14 @@ static PyObject *_wrap_Slider_GetMax(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_SetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13188,7 +13316,7 @@ static PyObject *_wrap_Slider_SetMin(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetMin",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13204,7 +13332,7 @@ static PyObject *_wrap_Slider_SetMin(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Slider_SetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13217,7 +13345,7 @@ static PyObject *_wrap_Slider_SetMax(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetMax",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13233,7 +13361,7 @@ static PyObject *_wrap_Slider_SetMax(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Slider_SetLineSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetLineSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13246,7 +13374,7 @@ static PyObject *_wrap_Slider_SetLineSize(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetLineSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13262,7 +13390,7 @@ static PyObject *_wrap_Slider_SetLineSize(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Slider_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13275,7 +13403,7 @@ static PyObject *_wrap_Slider_SetPageSize(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetPageSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13291,7 +13419,7 @@ static PyObject *_wrap_Slider_SetPageSize(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Slider_GetLineSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetLineSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13310,14 +13438,14 @@ static PyObject *_wrap_Slider_GetLineSize(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13336,14 +13464,14 @@ static PyObject *_wrap_Slider_GetPageSize(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_SetThumbLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetThumbLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13356,7 +13484,7 @@ static PyObject *_wrap_Slider_SetThumbLength(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetThumbLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13372,7 +13500,7 @@ static PyObject *_wrap_Slider_SetThumbLength(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Slider_GetThumbLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetThumbLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13391,14 +13519,14 @@ static PyObject *_wrap_Slider_GetThumbLength(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_SetTickFreq(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetTickFreq(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13413,10 +13541,10 @@ static PyObject *_wrap_Slider_SetTickFreq(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Slider_SetTickFreq",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13433,7 +13561,7 @@ static PyObject *_wrap_Slider_SetTickFreq(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Slider_GetTickFreq(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetTickFreq(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13452,14 +13580,14 @@ static PyObject *_wrap_Slider_GetTickFreq(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_ClearTicks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_ClearTicks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13484,7 +13612,7 @@ static PyObject *_wrap_Slider_ClearTicks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Slider_SetTick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetTick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13497,7 +13625,7 @@ static PyObject *_wrap_Slider_SetTick(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Slider_SetTick",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13513,7 +13641,7 @@ static PyObject *_wrap_Slider_SetTick(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Slider_ClearSel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_ClearSel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13538,7 +13666,7 @@ static PyObject *_wrap_Slider_ClearSel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Slider_GetSelEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetSelEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13557,14 +13685,14 @@ static PyObject *_wrap_Slider_GetSelEnd(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_GetSelStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetSelStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int result;
@@ -13583,14 +13711,14 @@ static PyObject *_wrap_Slider_GetSelStart(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Slider_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSlider *arg1 = (wxSlider *) 0 ;
     int arg2 ;
@@ -13605,9 +13733,9 @@ static PyObject *_wrap_Slider_SetSelection(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Slider_SetSelection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSlider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13623,7 +13751,7 @@ static PyObject *_wrap_Slider_SetSelection(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Slider_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Slider_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -13634,7 +13762,7 @@ static PyObject *_wrap_Slider_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Slider_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13656,14 +13784,14 @@ static PyObject *_wrap_Slider_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Slider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Slider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSlider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ToggleButtonNameStr_set(PyObject *_val) {
+static int _wrap_ToggleButtonNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ToggleButtonNameStr is read-only.");
     return 1;
 }
@@ -13683,7 +13811,7 @@ static PyObject *_wrap_ToggleButtonNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ToggleButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -13719,7 +13847,7 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -13742,7 +13870,7 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -13792,7 +13920,7 @@ static PyObject *_wrap_new_ToggleButton(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreToggleButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreToggleButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToggleButton *result;
     char *kwnames[] = {
@@ -13815,7 +13943,7 @@ static PyObject *_wrap_new_PreToggleButton(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToggleButton_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToggleButton *arg1 = (wxToggleButton *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -13855,7 +13983,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -13878,7 +14006,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -13929,7 +14057,7 @@ static PyObject *_wrap_ToggleButton_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ToggleButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToggleButton_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToggleButton *arg1 = (wxToggleButton *) 0 ;
     bool arg2 ;
@@ -13942,7 +14070,7 @@ static PyObject *_wrap_ToggleButton_SetValue(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToggleButton_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToggleButton,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13958,7 +14086,7 @@ static PyObject *_wrap_ToggleButton_SetValue(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ToggleButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToggleButton_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToggleButton *arg1 = (wxToggleButton *) 0 ;
     bool result;
@@ -13986,7 +14114,7 @@ static PyObject *_wrap_ToggleButton_GetValue(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ToggleButton_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToggleButton_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToggleButton *arg1 = (wxToggleButton *) 0 ;
     wxString *arg2 = 0 ;
@@ -14027,7 +14155,7 @@ static PyObject *_wrap_ToggleButton_SetLabel(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ToggleButton_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToggleButton_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -14038,7 +14166,7 @@ static PyObject *_wrap_ToggleButton_GetClassDefaultAttributes(PyObject *self, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ToggleButton_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14060,14 +14188,14 @@ static PyObject *_wrap_ToggleButton_GetClassDefaultAttributes(PyObject *self, Py
 }
 
 
-static PyObject * ToggleButton_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ToggleButton_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxToggleButton, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_NOTEBOOK_NAME_set(PyObject *_val) {
+static int _wrap_NOTEBOOK_NAME_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NOTEBOOK_NAME is read-only.");
     return 1;
 }
@@ -14087,7 +14215,7 @@ static PyObject *_wrap_NOTEBOOK_NAME_get() {
 }
 
 
-static PyObject *_wrap_BookCtrl_GetPageCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetPageCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t result;
@@ -14106,14 +14234,14 @@ static PyObject *_wrap_BookCtrl_GetPageCount(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BookCtrl_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14127,7 +14255,7 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14145,7 +14273,7 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_BookCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     int result;
@@ -14164,14 +14292,14 @@ static PyObject *_wrap_BookCtrl_GetSelection(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_SetPageText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14188,7 +14316,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BookCtrl_SetPageText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -14219,7 +14347,7 @@ static PyObject *_wrap_BookCtrl_SetPageText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_BookCtrl_GetPageText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetPageText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14233,7 +14361,7 @@ static PyObject *_wrap_BookCtrl_GetPageText(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPageText",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14255,7 +14383,7 @@ static PyObject *_wrap_BookCtrl_GetPageText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_BookCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_SetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -14284,7 +14412,7 @@ static PyObject *_wrap_BookCtrl_SetImageList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -14313,7 +14441,7 @@ static PyObject *_wrap_BookCtrl_AssignImageList(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_BookCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxImageList *result;
@@ -14341,7 +14469,7 @@ static PyObject *_wrap_BookCtrl_GetImageList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14355,7 +14483,7 @@ static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_GetPageImage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14364,14 +14492,14 @@ static PyObject *_wrap_BookCtrl_GetPageImage(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14387,9 +14515,9 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:BookCtrl_SetPageImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14407,7 +14535,7 @@ static PyObject *_wrap_BookCtrl_SetPageImage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_BookCtrl_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_SetPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxSize *arg2 = 0 ;
@@ -14439,7 +14567,7 @@ static PyObject *_wrap_BookCtrl_SetPageSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_BookCtrl_CalcSizeFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_CalcSizeFromPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxSize *arg2 = 0 ;
@@ -14476,7 +14604,7 @@ static PyObject *_wrap_BookCtrl_CalcSizeFromPage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_DeletePage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14490,7 +14618,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_DeletePage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14508,7 +14636,7 @@ static PyObject *_wrap_BookCtrl_DeletePage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_RemovePage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14522,7 +14650,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_RemovePage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14540,7 +14668,7 @@ static PyObject *_wrap_BookCtrl_RemovePage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     bool result;
@@ -14568,7 +14696,7 @@ static PyObject *_wrap_BookCtrl_DeleteAllPages(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_AddPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -14597,11 +14725,11 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14628,7 +14756,7 @@ static PyObject *_wrap_BookCtrl_AddPage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_InsertPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14651,7 +14779,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:BookCtrl_InsertPage",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -14661,11 +14789,11 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (bool) SWIG_AsBool(obj4); 
+        arg5 = (bool)SWIG_As_bool(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14692,7 +14820,7 @@ static PyObject *_wrap_BookCtrl_InsertPage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     size_t arg2 ;
@@ -14706,7 +14834,7 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrl_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14715,14 +14843,14 @@ static PyObject *_wrap_BookCtrl_SetSelection(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     bool arg2 = (bool) True ;
@@ -14736,7 +14864,7 @@ static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14753,7 +14881,7 @@ static PyObject *_wrap_BookCtrl_AdvanceSelection(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_BookCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -14764,7 +14892,7 @@ static PyObject *_wrap_BookCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:BookCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14786,14 +14914,14 @@ static PyObject *_wrap_BookCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * BookCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BookCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBookCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BookCtrlEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BookCtrlEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -14810,19 +14938,19 @@ static PyObject *_wrap_new_BookCtrlEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_BookCtrlEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14839,7 +14967,7 @@ static PyObject *_wrap_new_BookCtrlEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_BookCtrlEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlEvent_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ;
     int result;
@@ -14858,14 +14986,14 @@ static PyObject *_wrap_BookCtrlEvent_GetSelection(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BookCtrlEvent_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlEvent_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ;
     int arg2 ;
@@ -14878,7 +15006,7 @@ static PyObject *_wrap_BookCtrlEvent_SetSelection(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlEvent_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrlEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14894,7 +15022,7 @@ static PyObject *_wrap_BookCtrlEvent_SetSelection(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_BookCtrlEvent_GetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlEvent_GetOldSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ;
     int result;
@@ -14913,14 +15041,14 @@ static PyObject *_wrap_BookCtrlEvent_GetOldSelection(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BookCtrlEvent_SetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlEvent_SetOldSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlEvent *arg1 = (wxBookCtrlEvent *) 0 ;
     int arg2 ;
@@ -14933,7 +15061,7 @@ static PyObject *_wrap_BookCtrlEvent_SetOldSelection(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlEvent_SetOldSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrlEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14949,14 +15077,14 @@ static PyObject *_wrap_BookCtrlEvent_SetOldSelection(PyObject *self, PyObject *a
 }
 
 
-static PyObject * BookCtrlEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BookCtrlEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBookCtrlEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Notebook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -14985,7 +15113,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -15001,7 +15129,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -15034,7 +15162,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreNotebook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *result;
     char *kwnames[] = {
@@ -15057,7 +15185,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -15090,7 +15218,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -15106,7 +15234,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -15140,7 +15268,7 @@ static PyObject *_wrap_Notebook_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Notebook_GetRowCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_GetRowCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     int result;
@@ -15159,14 +15287,14 @@ static PyObject *_wrap_Notebook_GetRowCount(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Notebook_SetPadding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_SetPadding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxSize *arg2 = 0 ;
@@ -15198,7 +15326,7 @@ static PyObject *_wrap_Notebook_SetPadding(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Notebook_SetTabSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_SetTabSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxSize *arg2 = 0 ;
@@ -15230,7 +15358,7 @@ static PyObject *_wrap_Notebook_SetTabSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Notebook_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -15238,13 +15366,14 @@ static PyObject *_wrap_Notebook_HitTest(PyObject *self, PyObject *args, PyObject
     int result;
     wxPoint temp2 ;
     long temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "pt", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Notebook_HitTest",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNotebook,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15259,18 +15388,16 @@ static PyObject *_wrap_Notebook_HitTest(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = SWIG_From_int((int)result);
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Notebook_CalcSizeFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_CalcSizeFromPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxSize *arg2 = 0 ;
@@ -15307,7 +15434,7 @@ static PyObject *_wrap_Notebook_CalcSizeFromPage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Notebook_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Notebook_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -15318,7 +15445,7 @@ static PyObject *_wrap_Notebook_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Notebook_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15340,14 +15467,14 @@ static PyObject *_wrap_Notebook_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * Notebook_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Notebook_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNotebook, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_NotebookEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NotebookEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -15364,19 +15491,19 @@ static PyObject *_wrap_new_NotebookEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_NotebookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15393,14 +15520,14 @@ static PyObject *_wrap_new_NotebookEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * NotebookEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NotebookEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNotebookEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Listbook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -15429,7 +15556,7 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -15445,7 +15572,7 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -15478,7 +15605,7 @@ static PyObject *_wrap_new_Listbook(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreListbook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreListbook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListbook *result;
     char *kwnames[] = {
@@ -15501,7 +15628,7 @@ static PyObject *_wrap_new_PreListbook(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Listbook_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListbook *arg1 = (wxListbook *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -15534,7 +15661,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -15550,7 +15677,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -15584,7 +15711,7 @@ static PyObject *_wrap_Listbook_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Listbook_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Listbook_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListbook *arg1 = (wxListbook *) 0 ;
     bool result;
@@ -15612,14 +15739,14 @@ static PyObject *_wrap_Listbook_IsVertical(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * Listbook_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Listbook_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListbook, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ListbookEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListbookEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -15636,19 +15763,19 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ListbookEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15665,14 +15792,14 @@ static PyObject *_wrap_new_ListbookEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * ListbookEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListbookEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListbookEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BookCtrlSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BookCtrlSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
     wxBookCtrlSizer *result;
@@ -15698,7 +15825,7 @@ static PyObject *_wrap_new_BookCtrlSizer(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_BookCtrlSizer_RecalcSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlSizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlSizer *arg1 = (wxBookCtrlSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15723,7 +15850,7 @@ static PyObject *_wrap_BookCtrlSizer_RecalcSizes(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_BookCtrlSizer_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlSizer *arg1 = (wxBookCtrlSizer *) 0 ;
     wxSize result;
@@ -15753,7 +15880,7 @@ static PyObject *_wrap_BookCtrlSizer_CalcMin(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_BookCtrlSizer_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BookCtrlSizer_GetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBookCtrlSizer *arg1 = (wxBookCtrlSizer *) 0 ;
     wxBookCtrl *result;
@@ -15779,14 +15906,14 @@ static PyObject *_wrap_BookCtrlSizer_GetControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * BookCtrlSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BookCtrlSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBookCtrlSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_NotebookSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NotebookSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebook *arg1 = (wxNotebook *) 0 ;
     wxNotebookSizer *result;
@@ -15812,7 +15939,7 @@ static PyObject *_wrap_new_NotebookSizer(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_NotebookSizer_RecalcSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotebookSizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebookSizer *arg1 = (wxNotebookSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15837,7 +15964,7 @@ static PyObject *_wrap_NotebookSizer_RecalcSizes(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_NotebookSizer_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotebookSizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebookSizer *arg1 = (wxNotebookSizer *) 0 ;
     wxSize result;
@@ -15867,7 +15994,7 @@ static PyObject *_wrap_NotebookSizer_CalcMin(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_NotebookSizer_GetNotebook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotebookSizer_GetNotebook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotebookSizer *arg1 = (wxNotebookSizer *) 0 ;
     wxNotebook *result;
@@ -15895,14 +16022,14 @@ static PyObject *_wrap_NotebookSizer_GetNotebook(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * NotebookSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NotebookSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNotebookSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_ToolBarToolBase_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     int result;
@@ -15921,14 +16048,14 @@ static PyObject *_wrap_ToolBarToolBase_GetId(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxControl *result;
@@ -15956,7 +16083,7 @@ static PyObject *_wrap_ToolBarToolBase_GetControl(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxToolBarBase *result;
@@ -15984,7 +16111,7 @@ static PyObject *_wrap_ToolBarToolBase_GetToolBar(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_IsButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_IsButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     int result;
@@ -16003,14 +16130,14 @@ static PyObject *_wrap_ToolBarToolBase_IsButton(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_IsControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_IsControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     int result;
@@ -16029,14 +16156,14 @@ static PyObject *_wrap_ToolBarToolBase_IsControl(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_IsSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_IsSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     int result;
@@ -16055,14 +16182,14 @@ static PyObject *_wrap_ToolBarToolBase_IsSeparator(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     int result;
@@ -16081,14 +16208,14 @@ static PyObject *_wrap_ToolBarToolBase_GetStyle(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     int result;
@@ -16107,14 +16234,14 @@ static PyObject *_wrap_ToolBarToolBase_GetKind(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     bool result;
@@ -16142,7 +16269,7 @@ static PyObject *_wrap_ToolBarToolBase_IsEnabled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     bool result;
@@ -16170,7 +16297,7 @@ static PyObject *_wrap_ToolBarToolBase_IsToggled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     bool result;
@@ -16198,7 +16325,7 @@ static PyObject *_wrap_ToolBarToolBase_CanBeToggled(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetNormalBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetNormalBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxBitmap *result;
@@ -16230,7 +16357,7 @@ static PyObject *_wrap_ToolBarToolBase_GetNormalBitmap(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetDisabledBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetDisabledBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxBitmap *result;
@@ -16262,7 +16389,7 @@ static PyObject *_wrap_ToolBarToolBase_GetDisabledBitmap(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxBitmap result;
@@ -16292,7 +16419,7 @@ static PyObject *_wrap_ToolBarToolBase_GetBitmap(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString result;
@@ -16324,7 +16451,7 @@ static PyObject *_wrap_ToolBarToolBase_GetLabel(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetShortHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString result;
@@ -16356,7 +16483,7 @@ static PyObject *_wrap_ToolBarToolBase_GetShortHelp(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetLongHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString result;
@@ -16388,7 +16515,7 @@ static PyObject *_wrap_ToolBarToolBase_GetLongHelp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     bool arg2 ;
@@ -16402,7 +16529,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarToolBase_Enable",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarToolBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16420,7 +16547,7 @@ static PyObject *_wrap_ToolBarToolBase_Enable(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16445,7 +16572,7 @@ static PyObject *_wrap_ToolBarToolBase_Toggle(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     bool arg2 ;
@@ -16459,7 +16586,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarToolBase_SetToggle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarToolBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16477,7 +16604,7 @@ static PyObject *_wrap_ToolBarToolBase_SetToggle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16521,7 +16648,7 @@ static PyObject *_wrap_ToolBarToolBase_SetShortHelp(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16565,7 +16692,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLongHelp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetNormalBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetNormalBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -16599,7 +16726,7 @@ static PyObject *_wrap_ToolBarToolBase_SetNormalBitmap(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetDisabledBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetDisabledBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -16633,7 +16760,7 @@ static PyObject *_wrap_ToolBarToolBase_SetDisabledBitmap(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16674,7 +16801,7 @@ static PyObject *_wrap_ToolBarToolBase_SetLabel(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16699,7 +16826,7 @@ static PyObject *_wrap_ToolBarToolBase_Detach(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_Attach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     wxToolBarBase *arg2 = (wxToolBarBase *) 0 ;
@@ -16728,7 +16855,7 @@ static PyObject *_wrap_ToolBarToolBase_Attach(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_GetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_GetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     PyObject *result;
@@ -16754,7 +16881,7 @@ static PyObject *_wrap_ToolBarToolBase_GetClientData(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ToolBarToolBase_SetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarToolBase_SetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarToolBase *arg1 = (wxToolBarToolBase *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -16782,14 +16909,14 @@ static PyObject *_wrap_ToolBarToolBase_SetClientData(PyObject *self, PyObject *a
 }
 
 
-static PyObject * ToolBarToolBase_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ToolBarToolBase_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxToolBarToolBase, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -16823,7 +16950,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOOOO:ToolBarBase_DoAddTool",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -16847,7 +16974,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj5) {
-        arg6 = (wxItemKind) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -16907,7 +17034,7 @@ static PyObject *_wrap_ToolBarBase_DoAddTool(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     size_t arg2 ;
@@ -16943,9 +17070,9 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:ToolBarBase_DoInsertTool",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -16969,7 +17096,7 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args,
         }
     }
     if (obj6) {
-        arg7 = (wxItemKind) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -17029,7 +17156,7 @@ static PyObject *_wrap_ToolBarBase_DoInsertTool(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarBase_AddToolItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_AddToolItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxToolBarToolBase *arg2 = (wxToolBarToolBase *) 0 ;
@@ -17061,7 +17188,7 @@ static PyObject *_wrap_ToolBarBase_AddToolItem(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     size_t arg2 ;
@@ -17077,7 +17204,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertToolItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxToolBarToolBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17097,7 +17224,7 @@ static PyObject *_wrap_ToolBarBase_InsertToolItem(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarBase_AddControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_AddControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxControl *arg2 = (wxControl *) 0 ;
@@ -17129,7 +17256,7 @@ static PyObject *_wrap_ToolBarBase_AddControl(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     size_t arg2 ;
@@ -17145,7 +17272,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_InsertControl",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17165,7 +17292,7 @@ static PyObject *_wrap_ToolBarBase_InsertControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarBase_FindControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_FindControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17179,7 +17306,7 @@ static PyObject *_wrap_ToolBarBase_FindControl(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_FindControl",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17197,7 +17324,7 @@ static PyObject *_wrap_ToolBarBase_FindControl(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ToolBarBase_AddSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_AddSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxToolBarToolBase *result;
@@ -17225,7 +17352,7 @@ static PyObject *_wrap_ToolBarBase_AddSeparator(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     size_t arg2 ;
@@ -17239,7 +17366,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_InsertSeparator",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17257,7 +17384,7 @@ static PyObject *_wrap_ToolBarBase_InsertSeparator(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17271,7 +17398,7 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_RemoveTool",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17289,7 +17416,7 @@ static PyObject *_wrap_ToolBarBase_RemoveTool(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     size_t arg2 ;
@@ -17303,7 +17430,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_DeleteToolByPos",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17321,7 +17448,7 @@ static PyObject *_wrap_ToolBarBase_DeleteToolByPos(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17335,7 +17462,7 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_DeleteTool",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17353,7 +17480,7 @@ static PyObject *_wrap_ToolBarBase_DeleteTool(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_ClearTools(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_ClearTools(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17378,7 +17505,7 @@ static PyObject *_wrap_ToolBarBase_ClearTools(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_Realize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_Realize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     bool result;
@@ -17406,7 +17533,7 @@ static PyObject *_wrap_ToolBarBase_Realize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ToolBarBase_EnableTool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_EnableTool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17421,9 +17548,9 @@ static PyObject *_wrap_ToolBarBase_EnableTool(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_EnableTool",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17439,7 +17566,7 @@ static PyObject *_wrap_ToolBarBase_EnableTool(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_ToggleTool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_ToggleTool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17454,9 +17581,9 @@ static PyObject *_wrap_ToolBarBase_ToggleTool(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_ToggleTool",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17472,7 +17599,7 @@ static PyObject *_wrap_ToolBarBase_ToggleTool(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17487,9 +17614,9 @@ static PyObject *_wrap_ToolBarBase_SetToggle(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToggle",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17505,7 +17632,7 @@ static PyObject *_wrap_ToolBarBase_SetToggle(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17519,7 +17646,7 @@ static PyObject *_wrap_ToolBarBase_GetToolClientData(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolClientData",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17535,7 +17662,7 @@ static PyObject *_wrap_ToolBarBase_GetToolClientData(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToolClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToolClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17550,7 +17677,7 @@ static PyObject *_wrap_ToolBarBase_SetToolClientData(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolClientData",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     arg3 = obj2;
     {
@@ -17567,7 +17694,7 @@ static PyObject *_wrap_ToolBarBase_SetToolClientData(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17581,7 +17708,7 @@ static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolPos",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17590,14 +17717,14 @@ static PyObject *_wrap_ToolBarBase_GetToolPos(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17611,7 +17738,7 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolState",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17629,7 +17756,7 @@ static PyObject *_wrap_ToolBarBase_GetToolState(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17643,7 +17770,7 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolEnabled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17661,7 +17788,7 @@ static PyObject *_wrap_ToolBarBase_GetToolEnabled(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17677,7 +17804,7 @@ static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolShortHelp",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -17706,7 +17833,7 @@ static PyObject *_wrap_ToolBarBase_SetToolShortHelp(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolShortHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17720,7 +17847,7 @@ static PyObject *_wrap_ToolBarBase_GetToolShortHelp(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolShortHelp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17742,7 +17869,7 @@ static PyObject *_wrap_ToolBarBase_GetToolShortHelp(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17758,7 +17885,7 @@ static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetToolLongHelp",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -17787,7 +17914,7 @@ static PyObject *_wrap_ToolBarBase_SetToolLongHelp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolLongHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17801,7 +17928,7 @@ static PyObject *_wrap_ToolBarBase_GetToolLongHelp(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_GetToolLongHelp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17823,7 +17950,7 @@ static PyObject *_wrap_ToolBarBase_GetToolLongHelp(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetMarginsXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetMarginsXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17838,9 +17965,9 @@ static PyObject *_wrap_ToolBarBase_SetMarginsXY(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17856,7 +17983,7 @@ static PyObject *_wrap_ToolBarBase_SetMarginsXY(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxSize *arg2 = 0 ;
@@ -17888,7 +18015,7 @@ static PyObject *_wrap_ToolBarBase_SetMargins(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToolPacking(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17901,7 +18028,7 @@ static PyObject *_wrap_ToolBarBase_SetToolPacking(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetToolPacking",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17917,7 +18044,7 @@ static PyObject *_wrap_ToolBarBase_SetToolPacking(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToolSeparation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -17930,7 +18057,7 @@ static PyObject *_wrap_ToolBarBase_SetToolSeparation(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetToolSeparation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17946,7 +18073,7 @@ static PyObject *_wrap_ToolBarBase_SetToolSeparation(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxSize result;
@@ -17976,7 +18103,7 @@ static PyObject *_wrap_ToolBarBase_GetToolMargins(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxSize result;
@@ -18006,7 +18133,7 @@ static PyObject *_wrap_ToolBarBase_GetMargins(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolPacking(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int result;
@@ -18025,14 +18152,14 @@ static PyObject *_wrap_ToolBarBase_GetToolPacking(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolSeparation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int result;
@@ -18051,14 +18178,14 @@ static PyObject *_wrap_ToolBarBase_GetToolSeparation(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -18071,7 +18198,7 @@ static PyObject *_wrap_ToolBarBase_SetRows(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_SetRows",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18087,7 +18214,7 @@ static PyObject *_wrap_ToolBarBase_SetRows(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetMaxRowsCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetMaxRowsCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -18102,9 +18229,9 @@ static PyObject *_wrap_ToolBarBase_SetMaxRowsCols(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_SetMaxRowsCols",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18120,7 +18247,7 @@ static PyObject *_wrap_ToolBarBase_SetMaxRowsCols(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetMaxRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetMaxRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int result;
@@ -18139,14 +18266,14 @@ static PyObject *_wrap_ToolBarBase_GetMaxRows(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetMaxCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetMaxCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int result;
@@ -18165,14 +18292,14 @@ static PyObject *_wrap_ToolBarBase_GetMaxCols(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ToolBarBase_SetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_SetToolBitmapSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxSize *arg2 = 0 ;
@@ -18204,7 +18331,7 @@ static PyObject *_wrap_ToolBarBase_SetToolBitmapSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolBitmapSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxSize result;
@@ -18234,7 +18361,7 @@ static PyObject *_wrap_ToolBarBase_GetToolBitmapSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ToolBarBase_GetToolSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_GetToolSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     wxSize result;
@@ -18264,7 +18391,7 @@ static PyObject *_wrap_ToolBarBase_GetToolSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -18280,9 +18407,9 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBarBase_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18300,7 +18427,7 @@ static PyObject *_wrap_ToolBarBase_FindToolForPosition(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ToolBarBase_FindById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_FindById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     int arg2 ;
@@ -18314,7 +18441,7 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ToolBarBase_FindById",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBarBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18332,7 +18459,7 @@ static PyObject *_wrap_ToolBarBase_FindById(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBarBase *arg1 = (wxToolBarBase *) 0 ;
     bool result;
@@ -18360,14 +18487,14 @@ static PyObject *_wrap_ToolBarBase_IsVertical(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * ToolBarBase_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ToolBarBase_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxToolBarBase, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -18396,7 +18523,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -18412,7 +18539,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -18445,7 +18572,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBar *result;
     char *kwnames[] = {
@@ -18468,7 +18595,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBar_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBar *arg1 = (wxToolBar *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -18501,7 +18628,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -18517,7 +18644,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -18551,7 +18678,7 @@ static PyObject *_wrap_ToolBar_Create(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolBar *arg1 = (wxToolBar *) 0 ;
     int arg2 ;
@@ -18567,9 +18694,9 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxToolBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18587,7 +18714,7 @@ static PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -18598,7 +18725,7 @@ static PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *self, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ToolBar_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18620,14 +18747,14 @@ static PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *self, PyObjec
 }
 
 
-static PyObject * ToolBar_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ToolBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxToolBar, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ListCtrlNameStr_set(PyObject *_val) {
+static int _wrap_ListCtrlNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ListCtrlNameStr is read-only.");
     return 1;
 }
@@ -18647,7 +18774,7 @@ static PyObject *_wrap_ListCtrlNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_ListItemAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListItemAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour const &arg1_defvalue = wxNullColour ;
     wxColour *arg1 = (wxColour *) &arg1_defvalue ;
@@ -18701,7 +18828,7 @@ static PyObject *_wrap_new_ListItemAttr(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItemAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18733,7 +18860,7 @@ static PyObject *_wrap_ListItemAttr_SetTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ListItemAttr_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18765,7 +18892,7 @@ static PyObject *_wrap_ListItemAttr_SetBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListItemAttr_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     wxFont *arg2 = 0 ;
@@ -18799,7 +18926,7 @@ static PyObject *_wrap_ListItemAttr_SetFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     bool result;
@@ -18827,7 +18954,7 @@ static PyObject *_wrap_ListItemAttr_HasTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     bool result;
@@ -18855,7 +18982,7 @@ static PyObject *_wrap_ListItemAttr_HasBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListItemAttr_HasFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_HasFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     bool result;
@@ -18883,7 +19010,7 @@ static PyObject *_wrap_ListItemAttr_HasFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListItemAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     wxColour result;
@@ -18913,7 +19040,7 @@ static PyObject *_wrap_ListItemAttr_GetTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ListItemAttr_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     wxColour result;
@@ -18943,7 +19070,7 @@ static PyObject *_wrap_ListItemAttr_GetBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListItemAttr_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     wxFont result;
@@ -18973,7 +19100,7 @@ static PyObject *_wrap_ListItemAttr_GetFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListItemAttr_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItemAttr_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItemAttr *arg1 = (wxListItemAttr *) 0 ;
     PyObject * obj0 = 0 ;
@@ -18998,14 +19125,14 @@ static PyObject *_wrap_ListItemAttr_Destroy(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * ListItemAttr_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListItemAttr_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListItemAttr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *result;
     char *kwnames[] = {
@@ -19029,7 +19156,7 @@ static PyObject *_wrap_new_ListItem(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_ListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ListItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19054,7 +19181,7 @@ static PyObject *_wrap_delete_ListItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19079,7 +19206,7 @@ static PyObject *_wrap_ListItem_Clear(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListItem_ClearAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_ClearAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19104,7 +19231,7 @@ static PyObject *_wrap_ListItem_ClearAttributes(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListItem_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19117,7 +19244,7 @@ static PyObject *_wrap_ListItem_SetMask(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetMask",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19133,7 +19260,7 @@ static PyObject *_wrap_ListItem_SetMask(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19146,7 +19273,7 @@ static PyObject *_wrap_ListItem_SetId(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19162,7 +19289,7 @@ static PyObject *_wrap_ListItem_SetId(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListItem_SetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -19175,7 +19302,7 @@ static PyObject *_wrap_ListItem_SetColumn(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19191,7 +19318,7 @@ static PyObject *_wrap_ListItem_SetColumn(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListItem_SetState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19204,7 +19331,7 @@ static PyObject *_wrap_ListItem_SetState(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetState",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19220,7 +19347,7 @@ static PyObject *_wrap_ListItem_SetState(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListItem_SetStateMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetStateMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19233,7 +19360,7 @@ static PyObject *_wrap_ListItem_SetStateMask(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetStateMask",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19249,7 +19376,7 @@ static PyObject *_wrap_ListItem_SetStateMask(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListItem_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxString *arg2 = 0 ;
@@ -19290,7 +19417,7 @@ static PyObject *_wrap_ListItem_SetText(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_SetImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -19303,7 +19430,7 @@ static PyObject *_wrap_ListItem_SetImage(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetImage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19319,7 +19446,7 @@ static PyObject *_wrap_ListItem_SetImage(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListItem_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19332,7 +19459,7 @@ static PyObject *_wrap_ListItem_SetData(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetData",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19348,7 +19475,7 @@ static PyObject *_wrap_ListItem_SetData(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -19361,7 +19488,7 @@ static PyObject *_wrap_ListItem_SetWidth(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19377,7 +19504,7 @@ static PyObject *_wrap_ListItem_SetWidth(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListItem_SetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -19390,7 +19517,7 @@ static PyObject *_wrap_ListItem_SetAlign(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_SetAlign",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxListColumnFormat) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19406,7 +19533,7 @@ static PyObject *_wrap_ListItem_SetAlign(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListItem_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxColour *arg2 = 0 ;
@@ -19438,7 +19565,7 @@ static PyObject *_wrap_ListItem_SetTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListItem_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxColour *arg2 = 0 ;
@@ -19470,7 +19597,7 @@ static PyObject *_wrap_ListItem_SetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ListItem_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxFont *arg2 = 0 ;
@@ -19504,7 +19631,7 @@ static PyObject *_wrap_ListItem_SetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_GetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -19523,14 +19650,14 @@ static PyObject *_wrap_ListItem_GetMask(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -19549,14 +19676,14 @@ static PyObject *_wrap_ListItem_GetId(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -19575,14 +19702,14 @@ static PyObject *_wrap_ListItem_GetColumn(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -19601,14 +19728,14 @@ static PyObject *_wrap_ListItem_GetState(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxString *result;
@@ -19643,7 +19770,7 @@ static PyObject *_wrap_ListItem_GetText(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_GetImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -19662,14 +19789,14 @@ static PyObject *_wrap_ListItem_GetImage(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -19688,14 +19815,14 @@ static PyObject *_wrap_ListItem_GetData(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -19714,14 +19841,14 @@ static PyObject *_wrap_ListItem_GetWidth(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -19740,14 +19867,14 @@ static PyObject *_wrap_ListItem_GetAlign(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_GetAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxListItemAttr *result;
@@ -19773,7 +19900,7 @@ static PyObject *_wrap_ListItem_GetAttributes(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListItem_HasAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_HasAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     bool result;
@@ -19801,7 +19928,7 @@ static PyObject *_wrap_ListItem_HasAttributes(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListItem_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxColour result;
@@ -19831,7 +19958,7 @@ static PyObject *_wrap_ListItem_GetTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListItem_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxColour result;
@@ -19861,7 +19988,7 @@ static PyObject *_wrap_ListItem_GetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ListItem_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxFont result;
@@ -19891,7 +20018,7 @@ static PyObject *_wrap_ListItem_GetFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListItem_m_mask_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_mask_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19904,7 +20031,7 @@ static PyObject *_wrap_ListItem_m_mask_set(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_mask_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_mask = arg2;
     
@@ -19915,7 +20042,7 @@ static PyObject *_wrap_ListItem_m_mask_set(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListItem_m_mask_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_mask_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -19929,14 +20056,14 @@ static PyObject *_wrap_ListItem_m_mask_get(PyObject *self, PyObject *args, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_mask);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_itemId_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_itemId_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -19949,7 +20076,7 @@ static PyObject *_wrap_ListItem_m_itemId_set(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_itemId_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_itemId = arg2;
     
@@ -19960,7 +20087,7 @@ static PyObject *_wrap_ListItem_m_itemId_set(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListItem_m_itemId_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_itemId_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -19974,14 +20101,14 @@ static PyObject *_wrap_ListItem_m_itemId_get(PyObject *self, PyObject *args, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_itemId);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_col_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_col_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -19994,7 +20121,7 @@ static PyObject *_wrap_ListItem_m_col_set(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_col_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_col = arg2;
     
@@ -20005,7 +20132,7 @@ static PyObject *_wrap_ListItem_m_col_set(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListItem_m_col_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_col_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -20019,14 +20146,14 @@ static PyObject *_wrap_ListItem_m_col_get(PyObject *self, PyObject *args, PyObje
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_col);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_state_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_state_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -20039,7 +20166,7 @@ static PyObject *_wrap_ListItem_m_state_set(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_state_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_state = arg2;
     
@@ -20050,7 +20177,7 @@ static PyObject *_wrap_ListItem_m_state_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListItem_m_state_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_state_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -20064,14 +20191,14 @@ static PyObject *_wrap_ListItem_m_state_get(PyObject *self, PyObject *args, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_state);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_stateMask_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_stateMask_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -20084,7 +20211,7 @@ static PyObject *_wrap_ListItem_m_stateMask_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_stateMask_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_stateMask = arg2;
     
@@ -20095,7 +20222,7 @@ static PyObject *_wrap_ListItem_m_stateMask_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListItem_m_stateMask_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_stateMask_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -20109,14 +20236,14 @@ static PyObject *_wrap_ListItem_m_stateMask_get(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_stateMask);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_text_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxString *arg2 = (wxString *) 0 ;
@@ -20152,7 +20279,7 @@ static PyObject *_wrap_ListItem_m_text_set(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListItem_m_text_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_text_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     wxString *result;
@@ -20179,7 +20306,7 @@ static PyObject *_wrap_ListItem_m_text_get(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListItem_m_image_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_image_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -20192,7 +20319,7 @@ static PyObject *_wrap_ListItem_m_image_set(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_image_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_image = arg2;
     
@@ -20203,7 +20330,7 @@ static PyObject *_wrap_ListItem_m_image_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListItem_m_image_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_image_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -20217,14 +20344,14 @@ static PyObject *_wrap_ListItem_m_image_get(PyObject *self, PyObject *args, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_image);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_data_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_data_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long arg2 ;
@@ -20237,7 +20364,7 @@ static PyObject *_wrap_ListItem_m_data_set(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_data_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_data = arg2;
     
@@ -20248,7 +20375,7 @@ static PyObject *_wrap_ListItem_m_data_set(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListItem_m_data_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_data_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     long result;
@@ -20262,14 +20389,14 @@ static PyObject *_wrap_ListItem_m_data_get(PyObject *self, PyObject *args, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_data);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_format_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_format_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -20282,7 +20409,7 @@ static PyObject *_wrap_ListItem_m_format_set(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_format_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_format = arg2;
     
@@ -20293,7 +20420,7 @@ static PyObject *_wrap_ListItem_m_format_set(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListItem_m_format_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_format_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -20307,14 +20434,14 @@ static PyObject *_wrap_ListItem_m_format_get(PyObject *self, PyObject *args, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_format);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListItem_m_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int arg2 ;
@@ -20327,7 +20454,7 @@ static PyObject *_wrap_ListItem_m_width_set(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListItem_m_width_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_width = arg2;
     
@@ -20338,7 +20465,7 @@ static PyObject *_wrap_ListItem_m_width_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListItem_m_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListItem_m_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListItem *arg1 = (wxListItem *) 0 ;
     int result;
@@ -20352,21 +20479,21 @@ static PyObject *_wrap_ListItem_m_width_get(PyObject *self, PyObject *args, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_width);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * ListItem_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ListEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -20379,11 +20506,11 @@ static PyObject *_wrap_new_ListEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ListEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -20400,7 +20527,7 @@ static PyObject *_wrap_new_ListEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_ListEvent_m_code_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_code_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int arg2 ;
@@ -20413,7 +20540,7 @@ static PyObject *_wrap_ListEvent_m_code_set(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_code_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_code = arg2;
     
@@ -20424,7 +20551,7 @@ static PyObject *_wrap_ListEvent_m_code_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListEvent_m_code_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_code_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int result;
@@ -20438,14 +20565,14 @@ static PyObject *_wrap_ListEvent_m_code_get(PyObject *self, PyObject *args, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_code);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_m_oldItemIndex_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_oldItemIndex_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long arg2 ;
@@ -20458,7 +20585,7 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_set(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_oldItemIndex_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_oldItemIndex = arg2;
     
@@ -20469,7 +20596,7 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_set(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_oldItemIndex_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20483,14 +20610,14 @@ static PyObject *_wrap_ListEvent_m_oldItemIndex_get(PyObject *self, PyObject *ar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_oldItemIndex);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_m_itemIndex_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_itemIndex_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long arg2 ;
@@ -20503,7 +20630,7 @@ static PyObject *_wrap_ListEvent_m_itemIndex_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_itemIndex_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_itemIndex = arg2;
     
@@ -20514,7 +20641,7 @@ static PyObject *_wrap_ListEvent_m_itemIndex_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListEvent_m_itemIndex_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_itemIndex_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20528,14 +20655,14 @@ static PyObject *_wrap_ListEvent_m_itemIndex_get(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_itemIndex);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_m_col_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_col_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int arg2 ;
@@ -20548,7 +20675,7 @@ static PyObject *_wrap_ListEvent_m_col_set(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_m_col_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_col = arg2;
     
@@ -20559,7 +20686,7 @@ static PyObject *_wrap_ListEvent_m_col_set(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListEvent_m_col_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_col_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int result;
@@ -20573,14 +20700,14 @@ static PyObject *_wrap_ListEvent_m_col_get(PyObject *self, PyObject *args, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_col);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_m_pointDrag_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_pointDrag_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxPoint *arg2 = (wxPoint *) 0 ;
@@ -20604,7 +20731,7 @@ static PyObject *_wrap_ListEvent_m_pointDrag_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListEvent_m_pointDrag_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_pointDrag_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxPoint *result;
@@ -20625,7 +20752,7 @@ static PyObject *_wrap_ListEvent_m_pointDrag_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListEvent_m_item_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_m_item_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxListItem *result;
@@ -20648,7 +20775,7 @@ static PyObject *_wrap_ListEvent_m_item_get(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListEvent_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int result;
@@ -20667,14 +20794,14 @@ static PyObject *_wrap_ListEvent_GetKeyCode(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20693,14 +20820,14 @@ static PyObject *_wrap_ListEvent_GetIndex(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int result;
@@ -20719,14 +20846,14 @@ static PyObject *_wrap_ListEvent_GetColumn(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxPoint result;
@@ -20756,7 +20883,7 @@ static PyObject *_wrap_ListEvent_GetPoint(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListEvent_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxString *result;
@@ -20791,7 +20918,7 @@ static PyObject *_wrap_ListEvent_GetLabel(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListEvent_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxString *result;
@@ -20826,7 +20953,7 @@ static PyObject *_wrap_ListEvent_GetText(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListEvent_GetImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     int result;
@@ -20845,14 +20972,14 @@ static PyObject *_wrap_ListEvent_GetImage(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20871,14 +20998,14 @@ static PyObject *_wrap_ListEvent_GetData(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20897,14 +21024,14 @@ static PyObject *_wrap_ListEvent_GetMask(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     wxListItem *result;
@@ -20933,7 +21060,7 @@ static PyObject *_wrap_ListEvent_GetItem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListEvent_GetCacheFrom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetCacheFrom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20952,14 +21079,14 @@ static PyObject *_wrap_ListEvent_GetCacheFrom(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_GetCacheTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_GetCacheTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     long result;
@@ -20978,14 +21105,14 @@ static PyObject *_wrap_ListEvent_GetCacheTo(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     bool result;
@@ -21013,7 +21140,7 @@ static PyObject *_wrap_ListEvent_IsEditCancelled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListEvent_SetEditCanceled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListEvent_SetEditCanceled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListEvent *arg1 = (wxListEvent *) 0 ;
     bool arg2 ;
@@ -21026,7 +21153,7 @@ static PyObject *_wrap_ListEvent_SetEditCanceled(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListEvent_SetEditCanceled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21042,14 +21169,14 @@ static PyObject *_wrap_ListEvent_SetEditCanceled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * ListEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -21081,7 +21208,7 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -21097,7 +21224,7 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -21139,7 +21266,7 @@ static PyObject *_wrap_new_ListCtrl(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *result;
     char *kwnames[] = {
@@ -21162,7 +21289,7 @@ static PyObject *_wrap_new_PreListCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21198,7 +21325,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -21214,7 +21341,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -21257,7 +21384,7 @@ static PyObject *_wrap_ListCtrl_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -21288,7 +21415,7 @@ static PyObject *_wrap_ListCtrl__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -21323,7 +21450,7 @@ static PyObject *_wrap_ListCtrl_SetForegroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -21358,7 +21485,7 @@ static PyObject *_wrap_ListCtrl_SetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ListCtrl_GetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -21372,7 +21499,7 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21390,7 +21517,7 @@ static PyObject *_wrap_ListCtrl_GetColumn(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -21406,7 +21533,7 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -21431,7 +21558,7 @@ static PyObject *_wrap_ListCtrl_SetColumn(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -21445,7 +21572,7 @@ static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetColumnWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21454,14 +21581,14 @@ static PyObject *_wrap_ListCtrl_GetColumnWidth(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -21477,9 +21604,9 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetColumnWidth",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21497,7 +21624,7 @@ static PyObject *_wrap_ListCtrl_SetColumnWidth(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListCtrl_GetCountPerPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetCountPerPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int result;
@@ -21516,14 +21643,14 @@ static PyObject *_wrap_ListCtrl_GetCountPerPage(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_GetViewRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetViewRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxRect result;
@@ -21553,7 +21680,7 @@ static PyObject *_wrap_ListCtrl_GetViewRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21569,10 +21696,10 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_GetItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21591,7 +21718,7 @@ static PyObject *_wrap_ListCtrl_GetItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxListItem *arg2 = 0 ;
@@ -21628,7 +21755,7 @@ static PyObject *_wrap_ListCtrl_SetItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21649,9 +21776,9 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:ListCtrl_SetStringItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -21659,7 +21786,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21669,7 +21796,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp4)
         delete arg4;
@@ -21684,7 +21811,7 @@ static PyObject *_wrap_ListCtrl_SetStringItem(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21700,9 +21827,9 @@ static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_GetItemState",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21711,14 +21838,14 @@ static PyObject *_wrap_ListCtrl_GetItemState(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21736,11 +21863,11 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_SetItemState",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (long) SWIG_AsLong(obj3); 
+    arg4 = (long)SWIG_As_long(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21758,7 +21885,7 @@ static PyObject *_wrap_ListCtrl_SetItemState(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21776,11 +21903,11 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_SetItemImage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21798,7 +21925,7 @@ static PyObject *_wrap_ListCtrl_SetItemImage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21812,7 +21939,7 @@ static PyObject *_wrap_ListCtrl_GetItemText(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemText",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21834,7 +21961,7 @@ static PyObject *_wrap_ListCtrl_GetItemText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21850,7 +21977,7 @@ static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemText",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -21879,7 +22006,7 @@ static PyObject *_wrap_ListCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21893,7 +22020,7 @@ static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemData",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21902,14 +22029,14 @@ static PyObject *_wrap_ListCtrl_GetItemData(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21925,9 +22052,9 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemData",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21945,7 +22072,7 @@ static PyObject *_wrap_ListCtrl_SetItemData(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21959,7 +22086,7 @@ static PyObject *_wrap_ListCtrl_GetItemPosition(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21979,7 +22106,7 @@ static PyObject *_wrap_ListCtrl_GetItemPosition(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -21995,10 +22122,10 @@ static PyObject *_wrap_ListCtrl_GetItemRect(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_GetItemRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22019,7 +22146,7 @@ static PyObject *_wrap_ListCtrl_GetItemRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22036,7 +22163,7 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -22058,7 +22185,7 @@ static PyObject *_wrap_ListCtrl_SetItemPosition(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int result;
@@ -22077,14 +22204,14 @@ static PyObject *_wrap_ListCtrl_GetItemCount(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_GetColumnCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetColumnCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int result;
@@ -22103,14 +22230,14 @@ static PyObject *_wrap_ListCtrl_GetColumnCount(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxSize result;
@@ -22140,7 +22267,7 @@ static PyObject *_wrap_ListCtrl_GetItemSpacing(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -22155,10 +22282,10 @@ static PyObject *_wrap_ListCtrl_SetItemSpacing(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_SetItemSpacing",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22175,7 +22302,7 @@ static PyObject *_wrap_ListCtrl_SetItemSpacing(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListCtrl_GetSelectedItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetSelectedItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int result;
@@ -22194,14 +22321,14 @@ static PyObject *_wrap_ListCtrl_GetSelectedItemCount(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxColour result;
@@ -22231,7 +22358,7 @@ static PyObject *_wrap_ListCtrl_GetTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListCtrl_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -22263,7 +22390,7 @@ static PyObject *_wrap_ListCtrl_SetTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListCtrl_GetTopItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetTopItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long result;
@@ -22282,14 +22409,14 @@ static PyObject *_wrap_ListCtrl_GetTopItem(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22304,10 +22431,10 @@ static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListCtrl_SetSingleStyle",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22324,7 +22451,7 @@ static PyObject *_wrap_ListCtrl_SetSingleStyle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22337,7 +22464,7 @@ static PyObject *_wrap_ListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22353,7 +22480,7 @@ static PyObject *_wrap_ListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22371,14 +22498,14 @@ static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:ListCtrl_GetNextItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22388,14 +22515,14 @@ static PyObject *_wrap_ListCtrl_GetNextItem(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -22409,7 +22536,7 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetImageList",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22427,7 +22554,7 @@ static PyObject *_wrap_ListCtrl_GetImageList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -22444,7 +22571,7 @@ static PyObject *_wrap_ListCtrl_SetImageList(PyObject *self, PyObject *args, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxImageList,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22460,7 +22587,7 @@ static PyObject *_wrap_ListCtrl_SetImageList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -22477,7 +22604,7 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxImageList,
     SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22493,7 +22620,7 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListCtrl_InReportView(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InReportView(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     bool result;
@@ -22521,7 +22648,7 @@ static PyObject *_wrap_ListCtrl_InReportView(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     bool result;
@@ -22549,7 +22676,7 @@ static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListCtrl_RefreshItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_RefreshItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22562,7 +22689,7 @@ static PyObject *_wrap_ListCtrl_RefreshItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_RefreshItem",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22578,7 +22705,7 @@ static PyObject *_wrap_ListCtrl_RefreshItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ListCtrl_RefreshItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_RefreshItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22593,9 +22720,9 @@ static PyObject *_wrap_ListCtrl_RefreshItems(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_RefreshItems",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22611,7 +22738,7 @@ static PyObject *_wrap_ListCtrl_RefreshItems(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_Arrange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 = (int) wxLIST_ALIGN_DEFAULT ;
@@ -22626,7 +22753,7 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22645,7 +22772,7 @@ static PyObject *_wrap_ListCtrl_Arrange(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22659,7 +22786,7 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_DeleteItem",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22677,7 +22804,7 @@ static PyObject *_wrap_ListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     bool result;
@@ -22705,7 +22832,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllItems(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -22719,7 +22846,7 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_DeleteColumn",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22737,7 +22864,7 @@ static PyObject *_wrap_ListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     bool result;
@@ -22765,7 +22892,7 @@ static PyObject *_wrap_ListCtrl_DeleteAllColumns(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListCtrl_ClearAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_ClearAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22790,7 +22917,7 @@ static PyObject *_wrap_ListCtrl_ClearAll(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListCtrl_EditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_EditLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22803,7 +22930,7 @@ static PyObject *_wrap_ListCtrl_EditLabel(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EditLabel",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22819,7 +22946,7 @@ static PyObject *_wrap_ListCtrl_EditLabel(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22833,7 +22960,7 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_EnsureVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22851,7 +22978,7 @@ static PyObject *_wrap_ListCtrl_EnsureVisible(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_FindItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22870,7 +22997,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:ListCtrl_FindItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -22878,7 +23005,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22888,7 +23015,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp3)
         delete arg3;
@@ -22903,7 +23030,7 @@ static PyObject *_wrap_ListCtrl_FindItem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_FindItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22919,9 +23046,9 @@ static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_FindItemData",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22930,14 +23057,14 @@ static PyObject *_wrap_ListCtrl_FindItemData(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -22956,13 +23083,13 @@ static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_FindItemAtPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22971,14 +23098,14 @@ static PyObject *_wrap_ListCtrl_FindItemAtPos(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -22986,13 +23113,14 @@ static PyObject *_wrap_ListCtrl_HitTest(PyObject *self, PyObject *args, PyObject
     long result;
     wxPoint temp2 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "point", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_HitTest",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -23007,18 +23135,16 @@ static PyObject *_wrap_ListCtrl_HitTest(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = SWIG_From_long((long)result);
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxListItem *arg2 = 0 ;
@@ -23046,14 +23172,14 @@ static PyObject *_wrap_ListCtrl_InsertItem(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23070,7 +23196,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertStringItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -23084,7 +23210,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp3)
         delete arg3;
@@ -23099,7 +23225,7 @@ static PyObject *_wrap_ListCtrl_InsertStringItem(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23115,9 +23241,9 @@ static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertImageItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23126,14 +23252,14 @@ static PyObject *_wrap_ListCtrl_InsertImageItem(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23152,14 +23278,14 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ListCtrl_InsertImageStringItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
         if (arg3 == NULL) SWIG_fail;
         temp3 = True;
     }
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23168,7 +23294,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp3)
         delete arg3;
@@ -23183,7 +23309,7 @@ static PyObject *_wrap_ListCtrl_InsertImageStringItem(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23199,7 +23325,7 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_InsertColumnInfo",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxListItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -23215,14 +23341,14 @@ static PyObject *_wrap_ListCtrl_InsertColumnInfo(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23243,7 +23369,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:ListCtrl_InsertColumn",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -23251,11 +23377,11 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23265,7 +23391,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp3)
         delete arg3;
@@ -23280,7 +23406,7 @@ static PyObject *_wrap_ListCtrl_InsertColumn(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23293,7 +23419,7 @@ static PyObject *_wrap_ListCtrl_SetItemCount(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_SetItemCount",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23309,7 +23435,7 @@ static PyObject *_wrap_ListCtrl_SetItemCount(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_ScrollList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     int arg2 ;
@@ -23325,9 +23451,9 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_ScrollList",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23345,7 +23471,7 @@ static PyObject *_wrap_ListCtrl_ScrollList(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23361,7 +23487,7 @@ static PyObject *_wrap_ListCtrl_SetItemTextColour(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -23381,7 +23507,7 @@ static PyObject *_wrap_ListCtrl_SetItemTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23395,7 +23521,7 @@ static PyObject *_wrap_ListCtrl_GetItemTextColour(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemTextColour",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23415,7 +23541,7 @@ static PyObject *_wrap_ListCtrl_GetItemTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ListCtrl_SetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23431,7 +23557,7 @@ static PyObject *_wrap_ListCtrl_SetItemBackgroundColour(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListCtrl_SetItemBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -23451,7 +23577,7 @@ static PyObject *_wrap_ListCtrl_SetItemBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl_GetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     long arg2 ;
@@ -23465,7 +23591,7 @@ static PyObject *_wrap_ListCtrl_GetItemBackgroundColour(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListCtrl_GetItemBackgroundColour",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23485,7 +23611,7 @@ static PyObject *_wrap_ListCtrl_GetItemBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ListCtrl_SortItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_SortItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -23516,7 +23642,7 @@ static PyObject *_wrap_ListCtrl_SortItems(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ListCtrl_GetMainWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetMainWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
     wxWindow *result;
@@ -23544,7 +23670,7 @@ static PyObject *_wrap_ListCtrl_GetMainWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ListCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -23555,7 +23681,7 @@ static PyObject *_wrap_ListCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ListCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23577,14 +23703,14 @@ static PyObject *_wrap_ListCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * ListCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyListCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ListView(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -23616,7 +23742,7 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -23632,7 +23758,7 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -23674,7 +23800,7 @@ static PyObject *_wrap_new_ListView(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreListView(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreListView(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *result;
     char *kwnames[] = {
@@ -23697,7 +23823,7 @@ static PyObject *_wrap_new_PreListView(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -23733,7 +23859,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -23749,7 +23875,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -23792,7 +23918,7 @@ static PyObject *_wrap_ListView_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListView_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long arg2 ;
@@ -23807,10 +23933,10 @@ static PyObject *_wrap_ListView_Select(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ListView_Select",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListView,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23827,7 +23953,7 @@ static PyObject *_wrap_ListView_Select(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ListView_Focus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_Focus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long arg2 ;
@@ -23840,7 +23966,7 @@ static PyObject *_wrap_ListView_Focus(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_Focus",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListView,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23856,7 +23982,7 @@ static PyObject *_wrap_ListView_Focus(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ListView_GetFocusedItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_GetFocusedItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long result;
@@ -23875,14 +24001,14 @@ static PyObject *_wrap_ListView_GetFocusedItem(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_GetNextSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long arg2 ;
@@ -23896,7 +24022,7 @@ static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_GetNextSelected",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListView,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23905,14 +24031,14 @@ static PyObject *_wrap_ListView_GetNextSelected(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListView_GetFirstSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_GetFirstSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long result;
@@ -23931,14 +24057,14 @@ static PyObject *_wrap_ListView_GetFirstSelected(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_IsSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     long arg2 ;
@@ -23952,7 +24078,7 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_IsSelected",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListView,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23970,7 +24096,7 @@ static PyObject *_wrap_ListView_IsSelected(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ListView_SetColumnImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_SetColumnImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     int arg2 ;
@@ -23985,9 +24111,9 @@ static PyObject *_wrap_ListView_SetColumnImage(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ListView_SetColumnImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListView,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24003,7 +24129,7 @@ static PyObject *_wrap_ListView_SetColumnImage(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ListView_ClearColumnImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ListView_ClearColumnImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxListView *arg1 = (wxListView *) 0 ;
     int arg2 ;
@@ -24016,7 +24142,7 @@ static PyObject *_wrap_ListView_ClearColumnImage(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ListView_ClearColumnImage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxListView,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24032,14 +24158,14 @@ static PyObject *_wrap_ListView_ClearColumnImage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * ListView_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ListView_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxListView, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_TreeCtrlNameStr_set(PyObject *_val) {
+static int _wrap_TreeCtrlNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TreeCtrlNameStr is read-only.");
     return 1;
 }
@@ -24059,7 +24185,7 @@ static PyObject *_wrap_TreeCtrlNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_TreeItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *result;
     char *kwnames[] = {
@@ -24081,7 +24207,7 @@ static PyObject *_wrap_new_TreeItemId(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_TreeItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_TreeItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *arg1 = (wxTreeItemId *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24106,7 +24232,7 @@ static PyObject *_wrap_delete_TreeItemId(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeItemId_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemId_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *arg1 = (wxTreeItemId *) 0 ;
     bool result;
@@ -24134,7 +24260,7 @@ static PyObject *_wrap_TreeItemId_IsOk(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemId___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *arg1 = (wxTreeItemId *) 0 ;
     wxTreeItemId *arg2 = (wxTreeItemId *) 0 ;
@@ -24166,7 +24292,7 @@ static PyObject *_wrap_TreeItemId___eq__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemId___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *arg1 = (wxTreeItemId *) 0 ;
     wxTreeItemId *arg2 = (wxTreeItemId *) 0 ;
@@ -24198,7 +24324,7 @@ static PyObject *_wrap_TreeItemId___ne__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *arg1 = (wxTreeItemId *) 0 ;
     void *arg2 = (void *) 0 ;
@@ -24221,7 +24347,7 @@ static PyObject *_wrap_TreeItemId_m_pItem_set(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeItemId *arg1 = (wxTreeItemId *) 0 ;
     void *result;
@@ -24242,14 +24368,14 @@ static PyObject *_wrap_TreeItemId_m_pItem_get(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * TreeItemId_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeItemId_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTreeItemId, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TreeItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) NULL ;
     wxPyTreeItemData *result;
@@ -24276,7 +24402,7 @@ static PyObject *_wrap_new_TreeItemData(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeItemData_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemData_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ;
     PyObject *result;
@@ -24302,7 +24428,7 @@ static PyObject *_wrap_TreeItemData_GetData(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeItemData_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemData_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -24330,7 +24456,7 @@ static PyObject *_wrap_TreeItemData_SetData(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeItemData_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemData_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ;
     wxTreeItemId *result;
@@ -24359,7 +24485,7 @@ static PyObject *_wrap_TreeItemData_GetId(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeItemData_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemData_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -24393,7 +24519,7 @@ static PyObject *_wrap_TreeItemData_SetId(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeItemData_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeItemData_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeItemData *arg1 = (wxPyTreeItemData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24418,14 +24544,14 @@ static PyObject *_wrap_TreeItemData_Destroy(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * TreeItemData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeItemData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTreeItemData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -24438,11 +24564,11 @@ static PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TreeEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24459,7 +24585,7 @@ static PyObject *_wrap_new_TreeEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TreeEvent_GetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_GetItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxTreeItemId result;
@@ -24489,7 +24615,7 @@ static PyObject *_wrap_TreeEvent_GetItem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeEvent_SetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -24523,7 +24649,7 @@ static PyObject *_wrap_TreeEvent_SetItem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeEvent_GetOldItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_GetOldItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxTreeItemId result;
@@ -24553,7 +24679,7 @@ static PyObject *_wrap_TreeEvent_GetOldItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeEvent_SetOldItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetOldItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -24587,7 +24713,7 @@ static PyObject *_wrap_TreeEvent_SetOldItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeEvent_GetPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_GetPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxPoint result;
@@ -24617,7 +24743,7 @@ static PyObject *_wrap_TreeEvent_GetPoint(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeEvent_SetPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -24649,7 +24775,7 @@ static PyObject *_wrap_TreeEvent_SetPoint(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeEvent_GetKeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_GetKeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxKeyEvent *result;
@@ -24678,7 +24804,7 @@ static PyObject *_wrap_TreeEvent_GetKeyEvent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeEvent_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     int result;
@@ -24697,14 +24823,14 @@ static PyObject *_wrap_TreeEvent_GetKeyCode(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeEvent_SetKeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetKeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -24738,7 +24864,7 @@ static PyObject *_wrap_TreeEvent_SetKeyEvent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeEvent_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxString *result;
@@ -24773,7 +24899,7 @@ static PyObject *_wrap_TreeEvent_GetLabel(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeEvent_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -24814,7 +24940,7 @@ static PyObject *_wrap_TreeEvent_SetLabel(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     bool result;
@@ -24842,7 +24968,7 @@ static PyObject *_wrap_TreeEvent_IsEditCancelled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeEvent_SetEditCanceled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetEditCanceled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     bool arg2 ;
@@ -24855,7 +24981,7 @@ static PyObject *_wrap_TreeEvent_SetEditCanceled(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeEvent_SetEditCanceled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTreeEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24871,7 +24997,7 @@ static PyObject *_wrap_TreeEvent_SetEditCanceled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeEvent_SetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeEvent_SetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTreeEvent *arg1 = (wxTreeEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -24912,14 +25038,14 @@ static PyObject *_wrap_TreeEvent_SetToolTip(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * TreeEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTreeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -24951,7 +25077,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -24967,7 +25093,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -25009,7 +25135,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *result;
     char *kwnames[] = {
@@ -25032,7 +25158,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -25068,7 +25194,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -25084,7 +25210,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -25127,7 +25253,7 @@ static PyObject *_wrap_TreeCtrl_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25158,7 +25284,7 @@ static PyObject *_wrap_TreeCtrl__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     size_t result;
@@ -25177,14 +25303,14 @@ static PyObject *_wrap_TreeCtrl_GetCount(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     unsigned int result;
@@ -25203,14 +25329,14 @@ static PyObject *_wrap_TreeCtrl_GetIndent(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     unsigned int arg2 ;
@@ -25223,7 +25349,7 @@ static PyObject *_wrap_TreeCtrl_SetIndent(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SetIndent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25239,7 +25365,7 @@ static PyObject *_wrap_TreeCtrl_SetIndent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     unsigned int result;
@@ -25258,14 +25384,14 @@ static PyObject *_wrap_TreeCtrl_GetSpacing(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetSpacing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     unsigned int arg2 ;
@@ -25278,7 +25404,7 @@ static PyObject *_wrap_TreeCtrl_SetSpacing(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SetSpacing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25294,7 +25420,7 @@ static PyObject *_wrap_TreeCtrl_SetSpacing(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxImageList *result;
@@ -25322,7 +25448,7 @@ static PyObject *_wrap_TreeCtrl_GetImageList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxImageList *result;
@@ -25350,7 +25476,7 @@ static PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -25379,7 +25505,7 @@ static PyObject *_wrap_TreeCtrl_SetImageList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetStateImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -25408,7 +25534,7 @@ static PyObject *_wrap_TreeCtrl_SetStateImageList(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -25437,7 +25563,7 @@ static PyObject *_wrap_TreeCtrl_AssignImageList(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxImageList *arg2 = (wxImageList *) 0 ;
@@ -25466,7 +25592,7 @@ static PyObject *_wrap_TreeCtrl_AssignStateImageList(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25507,7 +25633,7 @@ static PyObject *_wrap_TreeCtrl_GetItemText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25531,7 +25657,7 @@ static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyO
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (wxTreeItemIcon) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25541,14 +25667,14 @@ static PyObject *_wrap_TreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25583,7 +25709,7 @@ static PyObject *_wrap_TreeCtrl_GetItemData(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemPyData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25618,7 +25744,7 @@ static PyObject *_wrap_TreeCtrl_GetItemPyData(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25657,7 +25783,7 @@ static PyObject *_wrap_TreeCtrl_GetItemTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25696,7 +25822,7 @@ static PyObject *_wrap_TreeCtrl_GetItemBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25735,7 +25861,7 @@ static PyObject *_wrap_TreeCtrl_GetItemFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25785,7 +25911,7 @@ static PyObject *_wrap_TreeCtrl_SetItemText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25809,10 +25935,10 @@ static PyObject *_wrap_TreeCtrl_SetItemImage(PyObject *self, PyObject *args, PyO
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (wxTreeItemIcon) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25829,7 +25955,7 @@ static PyObject *_wrap_TreeCtrl_SetItemImage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25867,7 +25993,7 @@ static PyObject *_wrap_TreeCtrl_SetItemData(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemPyData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25904,7 +26030,7 @@ static PyObject *_wrap_TreeCtrl_SetItemPyData(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25927,7 +26053,7 @@ static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *arg
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25944,7 +26070,7 @@ static PyObject *_wrap_TreeCtrl_SetItemHasChildren(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -25967,7 +26093,7 @@ static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyOb
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25984,7 +26110,7 @@ static PyObject *_wrap_TreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26025,7 +26151,7 @@ static PyObject *_wrap_TreeCtrl_SetItemTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26066,7 +26192,7 @@ static PyObject *_wrap_TreeCtrl_SetItemBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_SetItemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SetItemFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26109,7 +26235,7 @@ static PyObject *_wrap_TreeCtrl_SetItemFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26146,7 +26272,7 @@ static PyObject *_wrap_TreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26183,7 +26309,7 @@ static PyObject *_wrap_TreeCtrl_ItemHasChildren(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26220,7 +26346,7 @@ static PyObject *_wrap_TreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26257,7 +26383,7 @@ static PyObject *_wrap_TreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_IsBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26294,7 +26420,7 @@ static PyObject *_wrap_TreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26318,7 +26444,7 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args,
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -26328,14 +26454,14 @@ static PyObject *_wrap_TreeCtrl_GetChildrenCount(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetRootItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetRootItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId result;
@@ -26365,7 +26491,7 @@ static PyObject *_wrap_TreeCtrl_GetRootItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId result;
@@ -26395,7 +26521,7 @@ static PyObject *_wrap_TreeCtrl_GetSelection(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetSelections(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     PyObject *result;
@@ -26421,7 +26547,7 @@ static PyObject *_wrap_TreeCtrl_GetSelections(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetItemParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetItemParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26460,7 +26586,7 @@ static PyObject *_wrap_TreeCtrl_GetItemParent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetFirstChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26495,7 +26621,7 @@ static PyObject *_wrap_TreeCtrl_GetFirstChild(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26533,7 +26659,7 @@ static PyObject *_wrap_TreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetLastChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetLastChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26572,7 +26698,7 @@ static PyObject *_wrap_TreeCtrl_GetLastChild(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetNextSibling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetNextSibling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26611,7 +26737,7 @@ static PyObject *_wrap_TreeCtrl_GetNextSibling(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetPrevSibling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetPrevSibling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26650,7 +26776,7 @@ static PyObject *_wrap_TreeCtrl_GetPrevSibling(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetFirstVisibleItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId result;
@@ -26680,7 +26806,7 @@ static PyObject *_wrap_TreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetNextVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetNextVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26719,7 +26845,7 @@ static PyObject *_wrap_TreeCtrl_GetNextVisible(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetPrevVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetPrevVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26758,7 +26884,7 @@ static PyObject *_wrap_TreeCtrl_GetPrevVisible(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -26785,11 +26911,11 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -26822,7 +26948,7 @@ static PyObject *_wrap_TreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26858,11 +26984,11 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -26895,7 +27021,7 @@ static PyObject *_wrap_TreeCtrl_PrependItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -26940,11 +27066,11 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -26977,7 +27103,7 @@ static PyObject *_wrap_TreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27009,7 +27135,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args,
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+    arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -27017,11 +27143,11 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args,
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -27054,7 +27180,7 @@ static PyObject *_wrap_TreeCtrl_InsertItemBefore(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27090,11 +27216,11 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -27127,7 +27253,7 @@ static PyObject *_wrap_TreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeCtrl_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27161,7 +27287,7 @@ static PyObject *_wrap_TreeCtrl_Delete(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_DeleteChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_DeleteChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27195,7 +27321,7 @@ static PyObject *_wrap_TreeCtrl_DeleteChildren(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_DeleteAllItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_DeleteAllItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27220,7 +27346,7 @@ static PyObject *_wrap_TreeCtrl_DeleteAllItems(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_Expand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_Expand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27254,7 +27380,7 @@ static PyObject *_wrap_TreeCtrl_Expand(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_Collapse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_Collapse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27288,7 +27414,7 @@ static PyObject *_wrap_TreeCtrl_Collapse(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeCtrl_CollapseAndReset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_CollapseAndReset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27322,7 +27448,7 @@ static PyObject *_wrap_TreeCtrl_CollapseAndReset(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeCtrl_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27356,7 +27482,7 @@ static PyObject *_wrap_TreeCtrl_Toggle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TreeCtrl_Unselect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_Unselect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27381,7 +27507,7 @@ static PyObject *_wrap_TreeCtrl_Unselect(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeCtrl_UnselectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_UnselectItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27415,7 +27541,7 @@ static PyObject *_wrap_TreeCtrl_UnselectItem(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27440,7 +27566,7 @@ static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27463,7 +27589,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27480,7 +27606,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TreeCtrl_ToggleItemSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_ToggleItemSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27514,7 +27640,7 @@ static PyObject *_wrap_TreeCtrl_ToggleItemSelection(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_TreeCtrl_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_EnsureVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27548,7 +27674,7 @@ static PyObject *_wrap_TreeCtrl_EnsureVisible(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TreeCtrl_ScrollTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_ScrollTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27582,7 +27708,7 @@ static PyObject *_wrap_TreeCtrl_ScrollTo(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TreeCtrl_EditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_EditLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27616,7 +27742,7 @@ static PyObject *_wrap_TreeCtrl_EditLabel(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetEditControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTextCtrl *result;
@@ -27644,7 +27770,7 @@ static PyObject *_wrap_TreeCtrl_GetEditControl(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TreeCtrl_SortChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_SortChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27678,7 +27804,7 @@ static PyObject *_wrap_TreeCtrl_SortChildren(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TreeCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -27686,13 +27812,14 @@ static PyObject *_wrap_TreeCtrl_HitTest(PyObject *self, PyObject *args, PyObject
     wxTreeItemId result;
     wxPoint temp2 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "point", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_HitTest",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTreeCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -27712,17 +27839,15 @@ static PyObject *_wrap_TreeCtrl_HitTest(PyObject *self, PyObject *args, PyObject
         resultptr = new wxTreeItemId((wxTreeItemId &) result);
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxTreeItemId, 1);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -27746,7 +27871,7 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args,
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27763,7 +27888,7 @@ static PyObject *_wrap_TreeCtrl_GetBoundingRect(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TreeCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TreeCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -27774,7 +27899,7 @@ static PyObject *_wrap_TreeCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:TreeCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27796,14 +27921,14 @@ static PyObject *_wrap_TreeCtrl_GetClassDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * TreeCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TreeCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTreeCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_DirDialogDefaultFolderStr_set(PyObject *_val) {
+static int _wrap_DirDialogDefaultFolderStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DirDialogDefaultFolderStr is read-only.");
     return 1;
 }
@@ -27823,7 +27948,7 @@ static PyObject *_wrap_DirDialogDefaultFolderStr_get() {
 }
 
 
-static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GenericDirCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -27862,7 +27987,7 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -27885,7 +28010,7 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -27896,7 +28021,7 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
@@ -27945,7 +28070,7 @@ static PyObject *_wrap_new_GenericDirCtrl(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_PreGenericDirCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreGenericDirCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *result;
     char *kwnames[] = {
@@ -27968,7 +28093,7 @@ static PyObject *_wrap_new_PreGenericDirCtrl(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28011,7 +28136,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -28034,7 +28159,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -28045,7 +28170,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj8) {
-        arg9 = (int) SWIG_AsInt(obj8); 
+        arg9 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
@@ -28095,7 +28220,7 @@ static PyObject *_wrap_GenericDirCtrl_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -28139,7 +28264,7 @@ static PyObject *_wrap_GenericDirCtrl_ExpandPath(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetDefaultPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetDefaultPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString result;
@@ -28171,7 +28296,7 @@ static PyObject *_wrap_GenericDirCtrl_GetDefaultPath(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_SetDefaultPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_SetDefaultPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -28212,7 +28337,7 @@ static PyObject *_wrap_GenericDirCtrl_SetDefaultPath(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString result;
@@ -28244,7 +28369,7 @@ static PyObject *_wrap_GenericDirCtrl_GetPath(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetFilePath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetFilePath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString result;
@@ -28276,7 +28401,7 @@ static PyObject *_wrap_GenericDirCtrl_GetFilePath(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_SetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -28317,7 +28442,7 @@ static PyObject *_wrap_GenericDirCtrl_SetPath(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_ShowHidden(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_ShowHidden(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     bool arg2 ;
@@ -28330,7 +28455,7 @@ static PyObject *_wrap_GenericDirCtrl_ShowHidden(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GenericDirCtrl_ShowHidden",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGenericDirCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28346,7 +28471,7 @@ static PyObject *_wrap_GenericDirCtrl_ShowHidden(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     bool result;
@@ -28374,7 +28499,7 @@ static PyObject *_wrap_GenericDirCtrl_GetShowHidden(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString result;
@@ -28406,7 +28531,7 @@ static PyObject *_wrap_GenericDirCtrl_GetFilter(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_SetFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_SetFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -28447,7 +28572,7 @@ static PyObject *_wrap_GenericDirCtrl_SetFilter(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetFilterIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     int result;
@@ -28466,14 +28591,14 @@ static PyObject *_wrap_GenericDirCtrl_GetFilterIndex(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_SetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_SetFilterIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     int arg2 ;
@@ -28486,7 +28611,7 @@ static PyObject *_wrap_GenericDirCtrl_SetFilterIndex(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GenericDirCtrl_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGenericDirCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28502,7 +28627,7 @@ static PyObject *_wrap_GenericDirCtrl_SetFilterIndex(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetRootId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetRootId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxTreeItemId result;
@@ -28532,7 +28657,7 @@ static PyObject *_wrap_GenericDirCtrl_GetRootId(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetTreeCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxPyTreeCtrl *result;
@@ -28560,7 +28685,7 @@ static PyObject *_wrap_GenericDirCtrl_GetTreeCtrl(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_GetFilterListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_GetFilterListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxDirFilterListCtrl *result;
@@ -28586,7 +28711,7 @@ static PyObject *_wrap_GenericDirCtrl_GetFilterListCtrl(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     wxTreeItemId arg2 ;
@@ -28596,6 +28721,7 @@ static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args,
     wxTreeItemId *argp2 ;
     bool temp3 = False ;
     bool temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -28603,7 +28729,7 @@ static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args,
         (char *) "self",(char *) "parentId",(char *) "path", NULL 
     };
     
-    arg4 = &temp4;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GenericDirCtrl_FindChild",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGenericDirCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -28627,10 +28753,8 @@ static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args,
         resultptr = new wxTreeItemId((wxTreeItemId &) result);
         resultobj = SWIG_NewPointerObj((void *)(resultptr), SWIGTYPE_p_wxTreeItemId, 1);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_bool((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_bool, 0)));
     {
         if (temp3)
         delete arg3;
@@ -28645,7 +28769,7 @@ static PyObject *_wrap_GenericDirCtrl_FindChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_DoResize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_DoResize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28670,7 +28794,7 @@ static PyObject *_wrap_GenericDirCtrl_DoResize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GenericDirCtrl_ReCreateTree(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericDirCtrl_ReCreateTree(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28695,14 +28819,14 @@ static PyObject *_wrap_GenericDirCtrl_ReCreateTree(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * GenericDirCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GenericDirCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGenericDirCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DirFilterListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDirCtrl *arg1 = (wxGenericDirCtrl *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -28727,7 +28851,7 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGenericDirCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -28743,7 +28867,7 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28761,7 +28885,7 @@ static PyObject *_wrap_new_DirFilterListCtrl(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_PreDirFilterListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreDirFilterListCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirFilterListCtrl *result;
     char *kwnames[] = {
@@ -28784,7 +28908,7 @@ static PyObject *_wrap_new_PreDirFilterListCtrl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirFilterListCtrl *arg1 = (wxDirFilterListCtrl *) 0 ;
     wxGenericDirCtrl *arg2 = (wxGenericDirCtrl *) 0 ;
@@ -28813,7 +28937,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGenericDirCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -28829,7 +28953,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args,
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28848,7 +28972,7 @@ static PyObject *_wrap_DirFilterListCtrl_Create(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirFilterListCtrl *arg1 = (wxDirFilterListCtrl *) 0 ;
     wxString *arg2 = 0 ;
@@ -28869,7 +28993,7 @@ static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28893,14 +29017,14 @@ static PyObject *_wrap_DirFilterListCtrl_FillFilterList(PyObject *self, PyObject
 }
 
 
-static PyObject * DirFilterListCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DirFilterListCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDirFilterListCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -28932,7 +29056,7 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -28948,7 +29072,7 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -28990,7 +29114,7 @@ static PyObject *_wrap_new_PyControl(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_PrePyControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePyControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *result;
     char *kwnames[] = {
@@ -29013,7 +29137,7 @@ static PyObject *_wrap_new_PrePyControl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyControl__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -29044,7 +29168,7 @@ static PyObject *_wrap_PyControl__setCallbackInfo(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControl_SetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_SetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxSize *arg2 = 0 ;
@@ -29076,7 +29200,7 @@ static PyObject *_wrap_PyControl_SetBestSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int arg2 ;
@@ -29095,13 +29219,13 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyControl_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29117,7 +29241,7 @@ static PyObject *_wrap_PyControl_base_DoMoveWindow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int arg2 ;
@@ -29138,16 +29262,16 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyControl_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29164,7 +29288,7 @@ static PyObject *_wrap_PyControl_base_DoSetSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int arg2 ;
@@ -29179,9 +29303,9 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29197,7 +29321,7 @@ static PyObject *_wrap_PyControl_base_DoSetClientSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int arg2 ;
@@ -29212,9 +29336,9 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyControl_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29230,20 +29354,22 @@ static PyObject *_wrap_PyControl_base_DoSetVirtualSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControl_base_DoGetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -29255,34 +29381,32 @@ static PyObject *_wrap_PyControl_base_DoGetSize(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyControl_base_DoGetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetClientSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -29294,34 +29418,32 @@ static PyObject *_wrap_PyControl_base_DoGetClientSize(PyObject *self, PyObject *
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyControl_base_DoGetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyControl_base_DoGetPosition",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -29333,21 +29455,17 @@ static PyObject *_wrap_PyControl_base_DoGetPosition(PyObject *self, PyObject *ar
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyControl_base_DoGetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxSize result;
@@ -29377,7 +29495,7 @@ static PyObject *_wrap_PyControl_base_DoGetVirtualSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyControl_base_DoGetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxSize result;
@@ -29407,7 +29525,7 @@ static PyObject *_wrap_PyControl_base_DoGetBestSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyControl_base_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29432,7 +29550,7 @@ static PyObject *_wrap_PyControl_base_InitDialog(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     bool result;
@@ -29460,7 +29578,7 @@ static PyObject *_wrap_PyControl_base_TransferDataToWindow(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     bool result;
@@ -29488,7 +29606,7 @@ static PyObject *_wrap_PyControl_base_TransferDataFromWindow(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyControl_base_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     bool result;
@@ -29516,7 +29634,7 @@ static PyObject *_wrap_PyControl_base_Validate(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     bool result;
@@ -29544,7 +29662,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocus(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     bool result;
@@ -29572,7 +29690,7 @@ static PyObject *_wrap_PyControl_base_AcceptsFocusFromKeyboard(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyControl_base_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxSize result;
@@ -29602,7 +29720,7 @@ static PyObject *_wrap_PyControl_base_GetMaxSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyControl_base_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -29631,7 +29749,7 @@ static PyObject *_wrap_PyControl_base_AddChild(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyControl_base_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -29660,7 +29778,7 @@ static PyObject *_wrap_PyControl_base_RemoveChild(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     bool result;
@@ -29688,7 +29806,7 @@ static PyObject *_wrap_PyControl_base_ShouldInheritColours(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyControl_base_ApplyParentThemeBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -29720,7 +29838,7 @@ static PyObject *_wrap_PyControl_base_ApplyParentThemeBackground(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyControl *arg1 = (wxPyControl *) 0 ;
     wxVisualAttributes result;
@@ -29750,14 +29868,14 @@ static PyObject *_wrap_PyControl_base_GetDefaultAttributes(PyObject *self, PyObj
 }
 
 
-static PyObject * PyControl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyControl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyControl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HelpEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HelpEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -29774,11 +29892,11 @@ static PyObject *_wrap_new_HelpEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_HelpEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -29801,7 +29919,7 @@ static PyObject *_wrap_new_HelpEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HelpEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxPoint result;
@@ -29831,7 +29949,7 @@ static PyObject *_wrap_HelpEvent_GetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HelpEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -29863,7 +29981,7 @@ static PyObject *_wrap_HelpEvent_SetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HelpEvent_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpEvent_GetLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxString *result;
@@ -29898,7 +30016,7 @@ static PyObject *_wrap_HelpEvent_GetLink(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HelpEvent_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpEvent_SetLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -29939,7 +30057,7 @@ static PyObject *_wrap_HelpEvent_SetLink(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HelpEvent_GetTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpEvent_GetTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxString *result;
@@ -29974,7 +30092,7 @@ static PyObject *_wrap_HelpEvent_GetTarget(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HelpEvent_SetTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpEvent_SetTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpEvent *arg1 = (wxHelpEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -30015,14 +30133,14 @@ static PyObject *_wrap_HelpEvent_SetTarget(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * HelpEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HelpEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHelpEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ContextHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     bool arg2 = (bool) True ;
@@ -30039,7 +30157,7 @@ static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30057,7 +30175,7 @@ static PyObject *_wrap_new_ContextHelp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_ContextHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ContextHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextHelp *arg1 = (wxContextHelp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30082,7 +30200,7 @@ static PyObject *_wrap_delete_ContextHelp(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextHelp *arg1 = (wxContextHelp *) 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -30116,7 +30234,7 @@ static PyObject *_wrap_ContextHelp_BeginContextHelp(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextHelp *arg1 = (wxContextHelp *) 0 ;
     bool result;
@@ -30144,14 +30262,14 @@ static PyObject *_wrap_ContextHelp_EndContextHelp(PyObject *self, PyObject *args
 }
 
 
-static PyObject * ContextHelp_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ContextHelp_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxContextHelp, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ContextHelpButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxID_CONTEXT_HELP ;
@@ -30176,7 +30294,7 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -30192,7 +30310,7 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -30210,14 +30328,14 @@ static PyObject *_wrap_new_ContextHelpButton(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * ContextHelpButton_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ContextHelpButton_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxContextHelpButton, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HelpProvider_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     wxHelpProvider *result;
@@ -30243,7 +30361,7 @@ static PyObject *_wrap_HelpProvider_Set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HelpProvider_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *result;
     char *kwnames[] = {
@@ -30265,7 +30383,7 @@ static PyObject *_wrap_HelpProvider_Get(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HelpProvider_GetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_GetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -30301,7 +30419,7 @@ static PyObject *_wrap_HelpProvider_GetHelp(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -30333,7 +30451,7 @@ static PyObject *_wrap_HelpProvider_ShowHelp(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HelpProvider_AddHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_AddHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -30378,7 +30496,7 @@ static PyObject *_wrap_HelpProvider_AddHelp(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     int arg2 ;
@@ -30394,7 +30512,7 @@ static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HelpProvider_AddHelpById",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHelpProvider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -30423,7 +30541,7 @@ static PyObject *_wrap_HelpProvider_AddHelpById(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HelpProvider_RemoveHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_RemoveHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -30452,7 +30570,7 @@ static PyObject *_wrap_HelpProvider_RemoveHelp(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HelpProvider_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HelpProvider_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30477,14 +30595,14 @@ static PyObject *_wrap_HelpProvider_Destroy(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * HelpProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HelpProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHelpProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SimpleHelpProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SimpleHelpProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSimpleHelpProvider *result;
     char *kwnames[] = {
@@ -30506,14 +30624,14 @@ static PyObject *_wrap_new_SimpleHelpProvider(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * SimpleHelpProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SimpleHelpProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSimpleHelpProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DragImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxCursor const &arg2_defvalue = wxNullCursor ;
@@ -30557,7 +30675,7 @@ static PyObject *_wrap_new_DragImage(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DragIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = 0 ;
     wxCursor const &arg2_defvalue = wxNullCursor ;
@@ -30601,7 +30719,7 @@ static PyObject *_wrap_new_DragIcon(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DragString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxCursor const &arg2_defvalue = wxNullCursor ;
@@ -30652,7 +30770,7 @@ static PyObject *_wrap_new_DragString(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DragTreeItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTreeCtrl *arg1 = 0 ;
     wxTreeItemId *arg2 = 0 ;
@@ -30693,7 +30811,7 @@ static PyObject *_wrap_new_DragTreeItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DragListItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyListCtrl *arg1 = 0 ;
     long arg2 ;
@@ -30712,7 +30830,7 @@ static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -30729,7 +30847,7 @@ static PyObject *_wrap_new_DragListItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DragImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30754,7 +30872,7 @@ static PyObject *_wrap_delete_DragImage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxBitmap *arg2 = (wxBitmap *) 0 ;
@@ -30783,7 +30901,7 @@ static PyObject *_wrap_DragImage_SetBackingBitmap(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_BeginDrag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -30811,7 +30929,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -30834,7 +30952,7 @@ static PyObject *_wrap_DragImage_BeginDrag(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -30877,7 +30995,7 @@ static PyObject *_wrap_DragImage_BeginDragBounded(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_EndDrag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     bool result;
@@ -30905,7 +31023,7 @@ static PyObject *_wrap_DragImage_EndDrag(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_Move(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -30940,7 +31058,7 @@ static PyObject *_wrap_DragImage_Move(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     bool result;
@@ -30968,7 +31086,7 @@ static PyObject *_wrap_DragImage_Show(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_Hide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     bool result;
@@ -30996,7 +31114,7 @@ static PyObject *_wrap_DragImage_Hide(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_GetImageRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -31033,7 +31151,7 @@ static PyObject *_wrap_DragImage_GetImageRect(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_DoDrawImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31077,7 +31195,7 @@ static PyObject *_wrap_DragImage_DoDrawImage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxDC *arg2 = 0 ;
@@ -31137,7 +31255,7 @@ static PyObject *_wrap_DragImage_UpdateBackingFromWindow(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DragImage_RedrawImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGenericDragImage *arg1 = (wxGenericDragImage *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -31167,9 +31285,9 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (bool) SWIG_AsBool(obj3); 
+    arg4 = (bool)SWIG_As_bool(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (bool) SWIG_AsBool(obj4); 
+    arg5 = (bool)SWIG_As_bool(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31187,7 +31305,7 @@ static PyObject *_wrap_DragImage_RedrawImage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DragImage_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGenericDragImage, obj);
@@ -31195,846 +31313,846 @@ static PyObject * DragImage_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_Button", (PyCFunction) _wrap_new_Button, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreButton", (PyCFunction) _wrap_new_PreButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Button_Create", (PyCFunction) _wrap_Button_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Button_SetDefault", (PyCFunction) _wrap_Button_SetDefault, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Button_GetDefaultSize", (PyCFunction) _wrap_Button_GetDefaultSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Button_GetClassDefaultAttributes", (PyCFunction) _wrap_Button_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Button_swigregister", Button_swigregister, METH_VARARGS },
-        { (char *)"new_BitmapButton", (PyCFunction) _wrap_new_BitmapButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreBitmapButton", (PyCFunction) _wrap_new_PreBitmapButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_Create", (PyCFunction) _wrap_BitmapButton_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_GetBitmapLabel", (PyCFunction) _wrap_BitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_GetBitmapFocus", (PyCFunction) _wrap_BitmapButton_GetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_GetBitmapSelected", (PyCFunction) _wrap_BitmapButton_GetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_SetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_SetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_SetBitmapFocus", (PyCFunction) _wrap_BitmapButton_SetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_SetBitmapSelected", (PyCFunction) _wrap_BitmapButton_SetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_SetBitmapLabel", (PyCFunction) _wrap_BitmapButton_SetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_SetMargins", (PyCFunction) _wrap_BitmapButton_SetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_GetMarginX", (PyCFunction) _wrap_BitmapButton_GetMarginX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_GetMarginY", (PyCFunction) _wrap_BitmapButton_GetMarginY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapButton_swigregister", BitmapButton_swigregister, METH_VARARGS },
-        { (char *)"new_CheckBox", (PyCFunction) _wrap_new_CheckBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreCheckBox", (PyCFunction) _wrap_new_PreCheckBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_Create", (PyCFunction) _wrap_CheckBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_GetValue", (PyCFunction) _wrap_CheckBox_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_IsChecked", (PyCFunction) _wrap_CheckBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_SetValue", (PyCFunction) _wrap_CheckBox_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_Get3StateValue", (PyCFunction) _wrap_CheckBox_Get3StateValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_Set3StateValue", (PyCFunction) _wrap_CheckBox_Set3StateValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_Is3State", (PyCFunction) _wrap_CheckBox_Is3State, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_Is3rdStateAllowedForUser", (PyCFunction) _wrap_CheckBox_Is3rdStateAllowedForUser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_GetClassDefaultAttributes", (PyCFunction) _wrap_CheckBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckBox_swigregister", CheckBox_swigregister, METH_VARARGS },
-        { (char *)"new_Choice", (PyCFunction) _wrap_new_Choice, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreChoice", (PyCFunction) _wrap_new_PreChoice, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Choice_Create", (PyCFunction) _wrap_Choice_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Choice_SetSelection", (PyCFunction) _wrap_Choice_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Choice_SetStringSelection", (PyCFunction) _wrap_Choice_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Choice_SetString", (PyCFunction) _wrap_Choice_SetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Choice_GetClassDefaultAttributes", (PyCFunction) _wrap_Choice_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Choice_swigregister", Choice_swigregister, METH_VARARGS },
-        { (char *)"new_ComboBox", (PyCFunction) _wrap_new_ComboBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreComboBox", (PyCFunction) _wrap_new_PreComboBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_Create", (PyCFunction) _wrap_ComboBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_GetValue", (PyCFunction) _wrap_ComboBox_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetValue", (PyCFunction) _wrap_ComboBox_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_Copy", (PyCFunction) _wrap_ComboBox_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_Cut", (PyCFunction) _wrap_ComboBox_Cut, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_Paste", (PyCFunction) _wrap_ComboBox_Paste, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetInsertionPoint", (PyCFunction) _wrap_ComboBox_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_GetInsertionPoint", (PyCFunction) _wrap_ComboBox_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_GetLastPosition", (PyCFunction) _wrap_ComboBox_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_Replace", (PyCFunction) _wrap_ComboBox_Replace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetSelection", (PyCFunction) _wrap_ComboBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetMark", (PyCFunction) _wrap_ComboBox_SetMark, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetStringSelection", (PyCFunction) _wrap_ComboBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetString", (PyCFunction) _wrap_ComboBox_SetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_SetInsertionPointEnd", (PyCFunction) _wrap_ComboBox_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_Remove", (PyCFunction) _wrap_ComboBox_Remove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_GetClassDefaultAttributes", (PyCFunction) _wrap_ComboBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ComboBox_swigregister", ComboBox_swigregister, METH_VARARGS },
-        { (char *)"new_Gauge", (PyCFunction) _wrap_new_Gauge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreGauge", (PyCFunction) _wrap_new_PreGauge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_Create", (PyCFunction) _wrap_Gauge_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_SetRange", (PyCFunction) _wrap_Gauge_SetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_GetRange", (PyCFunction) _wrap_Gauge_GetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_SetValue", (PyCFunction) _wrap_Gauge_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_GetValue", (PyCFunction) _wrap_Gauge_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_IsVertical", (PyCFunction) _wrap_Gauge_IsVertical, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_SetShadowWidth", (PyCFunction) _wrap_Gauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_GetShadowWidth", (PyCFunction) _wrap_Gauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_SetBezelFace", (PyCFunction) _wrap_Gauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_GetBezelFace", (PyCFunction) _wrap_Gauge_GetBezelFace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_GetClassDefaultAttributes", (PyCFunction) _wrap_Gauge_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Gauge_swigregister", Gauge_swigregister, METH_VARARGS },
-        { (char *)"new_StaticBox", (PyCFunction) _wrap_new_StaticBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreStaticBox", (PyCFunction) _wrap_new_PreStaticBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBox_Create", (PyCFunction) _wrap_StaticBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBox_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBox_swigregister", StaticBox_swigregister, METH_VARARGS },
-        { (char *)"new_StaticLine", (PyCFunction) _wrap_new_StaticLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreStaticLine", (PyCFunction) _wrap_new_PreStaticLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticLine_Create", (PyCFunction) _wrap_StaticLine_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticLine_IsVertical", (PyCFunction) _wrap_StaticLine_IsVertical, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticLine_GetDefaultSize", (PyCFunction) _wrap_StaticLine_GetDefaultSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticLine_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticLine_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticLine_swigregister", StaticLine_swigregister, METH_VARARGS },
-        { (char *)"new_StaticText", (PyCFunction) _wrap_new_StaticText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreStaticText", (PyCFunction) _wrap_new_PreStaticText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticText_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticText_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS },
-        { (char *)"new_StaticBitmap", (PyCFunction) _wrap_new_StaticBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreStaticBitmap", (PyCFunction) _wrap_new_PreStaticBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBitmap_Create", (PyCFunction) _wrap_StaticBitmap_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBitmap_GetBitmap", (PyCFunction) _wrap_StaticBitmap_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBitmap_SetBitmap", (PyCFunction) _wrap_StaticBitmap_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBitmap_SetIcon", (PyCFunction) _wrap_StaticBitmap_SetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBitmap_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticBitmap_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBitmap_swigregister", StaticBitmap_swigregister, METH_VARARGS },
-        { (char *)"new_ListBox", (PyCFunction) _wrap_new_ListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreListBox", (PyCFunction) _wrap_new_PreListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_Create", (PyCFunction) _wrap_ListBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_Insert", (PyCFunction) _wrap_ListBox_Insert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_InsertItems", (PyCFunction) _wrap_ListBox_InsertItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_Set", (PyCFunction) _wrap_ListBox_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_IsSelected", (PyCFunction) _wrap_ListBox_IsSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetSelection", (PyCFunction) _wrap_ListBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_Select", (PyCFunction) _wrap_ListBox_Select, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_Deselect", (PyCFunction) _wrap_ListBox_Deselect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_DeselectAll", (PyCFunction) _wrap_ListBox_DeselectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetStringSelection", (PyCFunction) _wrap_ListBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_GetSelections", (PyCFunction) _wrap_ListBox_GetSelections, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetFirstItem", (PyCFunction) _wrap_ListBox_SetFirstItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetFirstItemStr", (PyCFunction) _wrap_ListBox_SetFirstItemStr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_EnsureVisible", (PyCFunction) _wrap_ListBox_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_AppendAndEnsureVisible", (PyCFunction) _wrap_ListBox_AppendAndEnsureVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_IsSorted", (PyCFunction) _wrap_ListBox_IsSorted, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetItemForegroundColour", (PyCFunction) _wrap_ListBox_SetItemForegroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetItemBackgroundColour", (PyCFunction) _wrap_ListBox_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_SetItemFont", (PyCFunction) _wrap_ListBox_SetItemFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_GetClassDefaultAttributes", (PyCFunction) _wrap_ListBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS },
-        { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckListBox_Create", (PyCFunction) _wrap_CheckListBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckListBox_IsChecked", (PyCFunction) _wrap_CheckListBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckListBox_Check", (PyCFunction) _wrap_CheckListBox_Check, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS },
-        { (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetFont", (PyCFunction) _wrap_TextAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetAlignment", (PyCFunction) _wrap_TextAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetTabs", (PyCFunction) _wrap_TextAttr_SetTabs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetLeftIndent", (PyCFunction) _wrap_TextAttr_SetLeftIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetRightIndent", (PyCFunction) _wrap_TextAttr_SetRightIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_SetFlags", (PyCFunction) _wrap_TextAttr_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasTextColour", (PyCFunction) _wrap_TextAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasBackgroundColour", (PyCFunction) _wrap_TextAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasFont", (PyCFunction) _wrap_TextAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasAlignment", (PyCFunction) _wrap_TextAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasTabs", (PyCFunction) _wrap_TextAttr_HasTabs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasLeftIndent", (PyCFunction) _wrap_TextAttr_HasLeftIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasRightIndent", (PyCFunction) _wrap_TextAttr_HasRightIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_HasFlag", (PyCFunction) _wrap_TextAttr_HasFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetTextColour", (PyCFunction) _wrap_TextAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetBackgroundColour", (PyCFunction) _wrap_TextAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetFont", (PyCFunction) _wrap_TextAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetAlignment", (PyCFunction) _wrap_TextAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetTabs", (PyCFunction) _wrap_TextAttr_GetTabs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetLeftIndent", (PyCFunction) _wrap_TextAttr_GetLeftIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetLeftSubIndent", (PyCFunction) _wrap_TextAttr_GetLeftSubIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetRightIndent", (PyCFunction) _wrap_TextAttr_GetRightIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_GetFlags", (PyCFunction) _wrap_TextAttr_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_IsDefault", (PyCFunction) _wrap_TextAttr_IsDefault, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_Combine", (PyCFunction) _wrap_TextAttr_Combine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextAttr_swigregister", TextAttr_swigregister, METH_VARARGS },
-        { (char *)"new_TextCtrl", (PyCFunction) _wrap_new_TextCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreTextCtrl", (PyCFunction) _wrap_new_PreTextCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Create", (PyCFunction) _wrap_TextCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetValue", (PyCFunction) _wrap_TextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetValue", (PyCFunction) _wrap_TextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetRange", (PyCFunction) _wrap_TextCtrl_GetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetLineLength", (PyCFunction) _wrap_TextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetLineText", (PyCFunction) _wrap_TextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetNumberOfLines", (PyCFunction) _wrap_TextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_IsModified", (PyCFunction) _wrap_TextCtrl_IsModified, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_IsEditable", (PyCFunction) _wrap_TextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_IsSingleLine", (PyCFunction) _wrap_TextCtrl_IsSingleLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_IsMultiLine", (PyCFunction) _wrap_TextCtrl_IsMultiLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetSelection", (PyCFunction) _wrap_TextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetStringSelection", (PyCFunction) _wrap_TextCtrl_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Clear", (PyCFunction) _wrap_TextCtrl_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Replace", (PyCFunction) _wrap_TextCtrl_Replace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Remove", (PyCFunction) _wrap_TextCtrl_Remove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_LoadFile", (PyCFunction) _wrap_TextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_MarkDirty", (PyCFunction) _wrap_TextCtrl_MarkDirty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_DiscardEdits", (PyCFunction) _wrap_TextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_EmulateKeyPress", (PyCFunction) _wrap_TextCtrl_EmulateKeyPress, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetStyle", (PyCFunction) _wrap_TextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetStyle", (PyCFunction) _wrap_TextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetDefaultStyle", (PyCFunction) _wrap_TextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetDefaultStyle", (PyCFunction) _wrap_TextCtrl_GetDefaultStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_XYToPosition", (PyCFunction) _wrap_TextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_PositionToXY", (PyCFunction) _wrap_TextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_ShowPosition", (PyCFunction) _wrap_TextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_HitTest", (PyCFunction) _wrap_TextCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_HitTestPos", (PyCFunction) _wrap_TextCtrl_HitTestPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Copy", (PyCFunction) _wrap_TextCtrl_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Cut", (PyCFunction) _wrap_TextCtrl_Cut, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Paste", (PyCFunction) _wrap_TextCtrl_Paste, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_CanCopy", (PyCFunction) _wrap_TextCtrl_CanCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_CanCut", (PyCFunction) _wrap_TextCtrl_CanCut, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_CanPaste", (PyCFunction) _wrap_TextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Undo", (PyCFunction) _wrap_TextCtrl_Undo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_Redo", (PyCFunction) _wrap_TextCtrl_Redo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_CanUndo", (PyCFunction) _wrap_TextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_CanRedo", (PyCFunction) _wrap_TextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetInsertionPoint", (PyCFunction) _wrap_TextCtrl_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetInsertionPointEnd", (PyCFunction) _wrap_TextCtrl_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetInsertionPoint", (PyCFunction) _wrap_TextCtrl_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetLastPosition", (PyCFunction) _wrap_TextCtrl_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetSelection", (PyCFunction) _wrap_TextCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SelectAll", (PyCFunction) _wrap_TextCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_SetEditable", (PyCFunction) _wrap_TextCtrl_SetEditable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_write", (PyCFunction) _wrap_TextCtrl_write, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetString", (PyCFunction) _wrap_TextCtrl_GetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_TextCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextCtrl_swigregister", TextCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_TextUrlEvent", (PyCFunction) _wrap_new_TextUrlEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextUrlEvent_GetMouseEvent", (PyCFunction) _wrap_TextUrlEvent_GetMouseEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextUrlEvent_GetURLStart", (PyCFunction) _wrap_TextUrlEvent_GetURLStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextUrlEvent_GetURLEnd", (PyCFunction) _wrap_TextUrlEvent_GetURLEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextUrlEvent_swigregister", TextUrlEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ScrollBar", (PyCFunction) _wrap_new_ScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreScrollBar", (PyCFunction) _wrap_new_PreScrollBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_Create", (PyCFunction) _wrap_ScrollBar_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_GetThumbPosition", (PyCFunction) _wrap_ScrollBar_GetThumbPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_GetThumbSize", (PyCFunction) _wrap_ScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_GetPageSize", (PyCFunction) _wrap_ScrollBar_GetPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_GetRange", (PyCFunction) _wrap_ScrollBar_GetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_IsVertical", (PyCFunction) _wrap_ScrollBar_IsVertical, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_SetThumbPosition", (PyCFunction) _wrap_ScrollBar_SetThumbPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_SetScrollbar", (PyCFunction) _wrap_ScrollBar_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ScrollBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollBar_swigregister", ScrollBar_swigregister, METH_VARARGS },
-        { (char *)"new_SpinButton", (PyCFunction) _wrap_new_SpinButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSpinButton", (PyCFunction) _wrap_new_PreSpinButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_Create", (PyCFunction) _wrap_SpinButton_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_GetValue", (PyCFunction) _wrap_SpinButton_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_GetMin", (PyCFunction) _wrap_SpinButton_GetMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_GetMax", (PyCFunction) _wrap_SpinButton_GetMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_SetValue", (PyCFunction) _wrap_SpinButton_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_SetMin", (PyCFunction) _wrap_SpinButton_SetMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_SetMax", (PyCFunction) _wrap_SpinButton_SetMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_SetRange", (PyCFunction) _wrap_SpinButton_SetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_IsVertical", (PyCFunction) _wrap_SpinButton_IsVertical, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_GetClassDefaultAttributes", (PyCFunction) _wrap_SpinButton_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinButton_swigregister", SpinButton_swigregister, METH_VARARGS },
-        { (char *)"new_SpinCtrl", (PyCFunction) _wrap_new_SpinCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSpinCtrl", (PyCFunction) _wrap_new_PreSpinCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_Create", (PyCFunction) _wrap_SpinCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_GetValue", (PyCFunction) _wrap_SpinCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_SetValue", (PyCFunction) _wrap_SpinCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_SetValueString", (PyCFunction) _wrap_SpinCtrl_SetValueString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_SetRange", (PyCFunction) _wrap_SpinCtrl_SetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_GetMin", (PyCFunction) _wrap_SpinCtrl_GetMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_GetMax", (PyCFunction) _wrap_SpinCtrl_GetMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_SetSelection", (PyCFunction) _wrap_SpinCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_SpinCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinCtrl_swigregister", SpinCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_SpinEvent", (PyCFunction) _wrap_new_SpinEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinEvent_GetPosition", (PyCFunction) _wrap_SpinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinEvent_SetPosition", (PyCFunction) _wrap_SpinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SpinEvent_swigregister", SpinEvent_swigregister, METH_VARARGS },
-        { (char *)"new_RadioBox", (PyCFunction) _wrap_new_RadioBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreRadioBox", (PyCFunction) _wrap_new_PreRadioBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_Create", (PyCFunction) _wrap_RadioBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_SetSelection", (PyCFunction) _wrap_RadioBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetSelection", (PyCFunction) _wrap_RadioBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetStringSelection", (PyCFunction) _wrap_RadioBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_SetStringSelection", (PyCFunction) _wrap_RadioBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetCount", (PyCFunction) _wrap_RadioBox_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_FindString", (PyCFunction) _wrap_RadioBox_FindString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetString", (PyCFunction) _wrap_RadioBox_GetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_SetString", (PyCFunction) _wrap_RadioBox_SetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_EnableItem", (PyCFunction) _wrap_RadioBox_EnableItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_ShowItem", (PyCFunction) _wrap_RadioBox_ShowItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetColumnCount", (PyCFunction) _wrap_RadioBox_GetColumnCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetRowCount", (PyCFunction) _wrap_RadioBox_GetRowCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetNextItem", (PyCFunction) _wrap_RadioBox_GetNextItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_GetClassDefaultAttributes", (PyCFunction) _wrap_RadioBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioBox_swigregister", RadioBox_swigregister, METH_VARARGS },
-        { (char *)"new_RadioButton", (PyCFunction) _wrap_new_RadioButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreRadioButton", (PyCFunction) _wrap_new_PreRadioButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioButton_Create", (PyCFunction) _wrap_RadioButton_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioButton_GetValue", (PyCFunction) _wrap_RadioButton_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioButton_SetValue", (PyCFunction) _wrap_RadioButton_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioButton_GetClassDefaultAttributes", (PyCFunction) _wrap_RadioButton_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RadioButton_swigregister", RadioButton_swigregister, METH_VARARGS },
-        { (char *)"new_Slider", (PyCFunction) _wrap_new_Slider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSlider", (PyCFunction) _wrap_new_PreSlider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_Create", (PyCFunction) _wrap_Slider_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetValue", (PyCFunction) _wrap_Slider_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetValue", (PyCFunction) _wrap_Slider_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetRange", (PyCFunction) _wrap_Slider_SetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetMin", (PyCFunction) _wrap_Slider_GetMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetMax", (PyCFunction) _wrap_Slider_GetMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetMin", (PyCFunction) _wrap_Slider_SetMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetMax", (PyCFunction) _wrap_Slider_SetMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetLineSize", (PyCFunction) _wrap_Slider_SetLineSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetPageSize", (PyCFunction) _wrap_Slider_SetPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetLineSize", (PyCFunction) _wrap_Slider_GetLineSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetPageSize", (PyCFunction) _wrap_Slider_GetPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetThumbLength", (PyCFunction) _wrap_Slider_SetThumbLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetThumbLength", (PyCFunction) _wrap_Slider_GetThumbLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetTickFreq", (PyCFunction) _wrap_Slider_SetTickFreq, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetTickFreq", (PyCFunction) _wrap_Slider_GetTickFreq, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_ClearTicks", (PyCFunction) _wrap_Slider_ClearTicks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetTick", (PyCFunction) _wrap_Slider_SetTick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_ClearSel", (PyCFunction) _wrap_Slider_ClearSel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetSelEnd", (PyCFunction) _wrap_Slider_GetSelEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetSelStart", (PyCFunction) _wrap_Slider_GetSelStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_SetSelection", (PyCFunction) _wrap_Slider_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_GetClassDefaultAttributes", (PyCFunction) _wrap_Slider_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Slider_swigregister", Slider_swigregister, METH_VARARGS },
-        { (char *)"new_ToggleButton", (PyCFunction) _wrap_new_ToggleButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreToggleButton", (PyCFunction) _wrap_new_PreToggleButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToggleButton_Create", (PyCFunction) _wrap_ToggleButton_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToggleButton_SetValue", (PyCFunction) _wrap_ToggleButton_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToggleButton_GetValue", (PyCFunction) _wrap_ToggleButton_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToggleButton_SetLabel", (PyCFunction) _wrap_ToggleButton_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToggleButton_GetClassDefaultAttributes", (PyCFunction) _wrap_ToggleButton_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToggleButton_swigregister", ToggleButton_swigregister, METH_VARARGS },
-        { (char *)"BookCtrl_GetPageCount", (PyCFunction) _wrap_BookCtrl_GetPageCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_GetPage", (PyCFunction) _wrap_BookCtrl_GetPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_GetSelection", (PyCFunction) _wrap_BookCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_SetPageText", (PyCFunction) _wrap_BookCtrl_SetPageText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_GetPageText", (PyCFunction) _wrap_BookCtrl_GetPageText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_SetImageList", (PyCFunction) _wrap_BookCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_AssignImageList", (PyCFunction) _wrap_BookCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_GetImageList", (PyCFunction) _wrap_BookCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_GetPageImage", (PyCFunction) _wrap_BookCtrl_GetPageImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_SetPageImage", (PyCFunction) _wrap_BookCtrl_SetPageImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_SetPageSize", (PyCFunction) _wrap_BookCtrl_SetPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_CalcSizeFromPage", (PyCFunction) _wrap_BookCtrl_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_DeletePage", (PyCFunction) _wrap_BookCtrl_DeletePage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_RemovePage", (PyCFunction) _wrap_BookCtrl_RemovePage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_DeleteAllPages", (PyCFunction) _wrap_BookCtrl_DeleteAllPages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_AddPage", (PyCFunction) _wrap_BookCtrl_AddPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_InsertPage", (PyCFunction) _wrap_BookCtrl_InsertPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_SetSelection", (PyCFunction) _wrap_BookCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_AdvanceSelection", (PyCFunction) _wrap_BookCtrl_AdvanceSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_BookCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrl_swigregister", BookCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_BookCtrlEvent", (PyCFunction) _wrap_new_BookCtrlEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlEvent_GetSelection", (PyCFunction) _wrap_BookCtrlEvent_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlEvent_SetSelection", (PyCFunction) _wrap_BookCtrlEvent_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlEvent_GetOldSelection", (PyCFunction) _wrap_BookCtrlEvent_GetOldSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlEvent_SetOldSelection", (PyCFunction) _wrap_BookCtrlEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlEvent_swigregister", BookCtrlEvent_swigregister, METH_VARARGS },
-        { (char *)"new_Notebook", (PyCFunction) _wrap_new_Notebook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreNotebook", (PyCFunction) _wrap_new_PreNotebook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_Create", (PyCFunction) _wrap_Notebook_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_GetRowCount", (PyCFunction) _wrap_Notebook_GetRowCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_SetPadding", (PyCFunction) _wrap_Notebook_SetPadding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_SetTabSize", (PyCFunction) _wrap_Notebook_SetTabSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_HitTest", (PyCFunction) _wrap_Notebook_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_CalcSizeFromPage", (PyCFunction) _wrap_Notebook_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_GetClassDefaultAttributes", (PyCFunction) _wrap_Notebook_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Notebook_swigregister", Notebook_swigregister, METH_VARARGS },
-        { (char *)"new_NotebookEvent", (PyCFunction) _wrap_new_NotebookEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotebookEvent_swigregister", NotebookEvent_swigregister, METH_VARARGS },
-        { (char *)"new_Listbook", (PyCFunction) _wrap_new_Listbook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreListbook", (PyCFunction) _wrap_new_PreListbook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Listbook_Create", (PyCFunction) _wrap_Listbook_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Listbook_IsVertical", (PyCFunction) _wrap_Listbook_IsVertical, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Listbook_swigregister", Listbook_swigregister, METH_VARARGS },
-        { (char *)"new_ListbookEvent", (PyCFunction) _wrap_new_ListbookEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListbookEvent_swigregister", ListbookEvent_swigregister, METH_VARARGS },
-        { (char *)"new_BookCtrlSizer", (PyCFunction) _wrap_new_BookCtrlSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlSizer_RecalcSizes", (PyCFunction) _wrap_BookCtrlSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlSizer_CalcMin", (PyCFunction) _wrap_BookCtrlSizer_CalcMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlSizer_GetControl", (PyCFunction) _wrap_BookCtrlSizer_GetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BookCtrlSizer_swigregister", BookCtrlSizer_swigregister, METH_VARARGS },
-        { (char *)"new_NotebookSizer", (PyCFunction) _wrap_new_NotebookSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotebookSizer_RecalcSizes", (PyCFunction) _wrap_NotebookSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotebookSizer_CalcMin", (PyCFunction) _wrap_NotebookSizer_CalcMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotebookSizer_GetNotebook", (PyCFunction) _wrap_NotebookSizer_GetNotebook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotebookSizer_swigregister", NotebookSizer_swigregister, METH_VARARGS },
-        { (char *)"ToolBarToolBase_GetId", (PyCFunction) _wrap_ToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetControl", (PyCFunction) _wrap_ToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetToolBar", (PyCFunction) _wrap_ToolBarToolBase_GetToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_IsButton", (PyCFunction) _wrap_ToolBarToolBase_IsButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_IsControl", (PyCFunction) _wrap_ToolBarToolBase_IsControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_IsSeparator", (PyCFunction) _wrap_ToolBarToolBase_IsSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetStyle", (PyCFunction) _wrap_ToolBarToolBase_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetKind", (PyCFunction) _wrap_ToolBarToolBase_GetKind, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_IsEnabled", (PyCFunction) _wrap_ToolBarToolBase_IsEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_IsToggled", (PyCFunction) _wrap_ToolBarToolBase_IsToggled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_CanBeToggled", (PyCFunction) _wrap_ToolBarToolBase_CanBeToggled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetNormalBitmap", (PyCFunction) _wrap_ToolBarToolBase_GetNormalBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetDisabledBitmap", (PyCFunction) _wrap_ToolBarToolBase_GetDisabledBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetBitmap", (PyCFunction) _wrap_ToolBarToolBase_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetLabel", (PyCFunction) _wrap_ToolBarToolBase_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetShortHelp", (PyCFunction) _wrap_ToolBarToolBase_GetShortHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetLongHelp", (PyCFunction) _wrap_ToolBarToolBase_GetLongHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_Enable", (PyCFunction) _wrap_ToolBarToolBase_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_Toggle", (PyCFunction) _wrap_ToolBarToolBase_Toggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetToggle", (PyCFunction) _wrap_ToolBarToolBase_SetToggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetShortHelp", (PyCFunction) _wrap_ToolBarToolBase_SetShortHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetLongHelp", (PyCFunction) _wrap_ToolBarToolBase_SetLongHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetNormalBitmap", (PyCFunction) _wrap_ToolBarToolBase_SetNormalBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetDisabledBitmap", (PyCFunction) _wrap_ToolBarToolBase_SetDisabledBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetLabel", (PyCFunction) _wrap_ToolBarToolBase_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_Detach", (PyCFunction) _wrap_ToolBarToolBase_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_Attach", (PyCFunction) _wrap_ToolBarToolBase_Attach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_GetClientData", (PyCFunction) _wrap_ToolBarToolBase_GetClientData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_SetClientData", (PyCFunction) _wrap_ToolBarToolBase_SetClientData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarToolBase_swigregister", ToolBarToolBase_swigregister, METH_VARARGS },
-        { (char *)"ToolBarBase_DoAddTool", (PyCFunction) _wrap_ToolBarBase_DoAddTool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_DoInsertTool", (PyCFunction) _wrap_ToolBarBase_DoInsertTool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_AddToolItem", (PyCFunction) _wrap_ToolBarBase_AddToolItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_InsertToolItem", (PyCFunction) _wrap_ToolBarBase_InsertToolItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_AddControl", (PyCFunction) _wrap_ToolBarBase_AddControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_InsertControl", (PyCFunction) _wrap_ToolBarBase_InsertControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_FindControl", (PyCFunction) _wrap_ToolBarBase_FindControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_AddSeparator", (PyCFunction) _wrap_ToolBarBase_AddSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_InsertSeparator", (PyCFunction) _wrap_ToolBarBase_InsertSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_RemoveTool", (PyCFunction) _wrap_ToolBarBase_RemoveTool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_DeleteToolByPos", (PyCFunction) _wrap_ToolBarBase_DeleteToolByPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_DeleteTool", (PyCFunction) _wrap_ToolBarBase_DeleteTool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_ClearTools", (PyCFunction) _wrap_ToolBarBase_ClearTools, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_Realize", (PyCFunction) _wrap_ToolBarBase_Realize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_EnableTool", (PyCFunction) _wrap_ToolBarBase_EnableTool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_ToggleTool", (PyCFunction) _wrap_ToolBarBase_ToggleTool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToggle", (PyCFunction) _wrap_ToolBarBase_SetToggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolClientData", (PyCFunction) _wrap_ToolBarBase_GetToolClientData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToolClientData", (PyCFunction) _wrap_ToolBarBase_SetToolClientData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolPos", (PyCFunction) _wrap_ToolBarBase_GetToolPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolState", (PyCFunction) _wrap_ToolBarBase_GetToolState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolEnabled", (PyCFunction) _wrap_ToolBarBase_GetToolEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToolShortHelp", (PyCFunction) _wrap_ToolBarBase_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolShortHelp", (PyCFunction) _wrap_ToolBarBase_GetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToolLongHelp", (PyCFunction) _wrap_ToolBarBase_SetToolLongHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolLongHelp", (PyCFunction) _wrap_ToolBarBase_GetToolLongHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetMarginsXY", (PyCFunction) _wrap_ToolBarBase_SetMarginsXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetMargins", (PyCFunction) _wrap_ToolBarBase_SetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToolPacking", (PyCFunction) _wrap_ToolBarBase_SetToolPacking, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToolSeparation", (PyCFunction) _wrap_ToolBarBase_SetToolSeparation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolMargins", (PyCFunction) _wrap_ToolBarBase_GetToolMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetMargins", (PyCFunction) _wrap_ToolBarBase_GetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolPacking", (PyCFunction) _wrap_ToolBarBase_GetToolPacking, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolSeparation", (PyCFunction) _wrap_ToolBarBase_GetToolSeparation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetRows", (PyCFunction) _wrap_ToolBarBase_SetRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetMaxRowsCols", (PyCFunction) _wrap_ToolBarBase_SetMaxRowsCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetMaxRows", (PyCFunction) _wrap_ToolBarBase_GetMaxRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetMaxCols", (PyCFunction) _wrap_ToolBarBase_GetMaxCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_SetToolBitmapSize", (PyCFunction) _wrap_ToolBarBase_SetToolBitmapSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolBitmapSize", (PyCFunction) _wrap_ToolBarBase_GetToolBitmapSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_GetToolSize", (PyCFunction) _wrap_ToolBarBase_GetToolSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_FindToolForPosition", (PyCFunction) _wrap_ToolBarBase_FindToolForPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_FindById", (PyCFunction) _wrap_ToolBarBase_FindById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_IsVertical", (PyCFunction) _wrap_ToolBarBase_IsVertical, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBarBase_swigregister", ToolBarBase_swigregister, METH_VARARGS },
-        { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreToolBar", (PyCFunction) _wrap_new_PreToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBar_FindToolForPosition", (PyCFunction) _wrap_ToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS },
-        { (char *)"new_ListItemAttr", (PyCFunction) _wrap_new_ListItemAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_SetTextColour", (PyCFunction) _wrap_ListItemAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_SetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_SetFont", (PyCFunction) _wrap_ListItemAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_HasTextColour", (PyCFunction) _wrap_ListItemAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_HasBackgroundColour", (PyCFunction) _wrap_ListItemAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_HasFont", (PyCFunction) _wrap_ListItemAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_GetTextColour", (PyCFunction) _wrap_ListItemAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_GetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_GetFont", (PyCFunction) _wrap_ListItemAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_Destroy", (PyCFunction) _wrap_ListItemAttr_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItemAttr_swigregister", ListItemAttr_swigregister, METH_VARARGS },
-        { (char *)"new_ListItem", (PyCFunction) _wrap_new_ListItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ListItem", (PyCFunction) _wrap_delete_ListItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_Clear", (PyCFunction) _wrap_ListItem_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_ClearAttributes", (PyCFunction) _wrap_ListItem_ClearAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetMask", (PyCFunction) _wrap_ListItem_SetMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetId", (PyCFunction) _wrap_ListItem_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetColumn", (PyCFunction) _wrap_ListItem_SetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetState", (PyCFunction) _wrap_ListItem_SetState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetStateMask", (PyCFunction) _wrap_ListItem_SetStateMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetText", (PyCFunction) _wrap_ListItem_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetImage", (PyCFunction) _wrap_ListItem_SetImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetData", (PyCFunction) _wrap_ListItem_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetWidth", (PyCFunction) _wrap_ListItem_SetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetAlign", (PyCFunction) _wrap_ListItem_SetAlign, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetTextColour", (PyCFunction) _wrap_ListItem_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetBackgroundColour", (PyCFunction) _wrap_ListItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_SetFont", (PyCFunction) _wrap_ListItem_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetMask", (PyCFunction) _wrap_ListItem_GetMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetId", (PyCFunction) _wrap_ListItem_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetColumn", (PyCFunction) _wrap_ListItem_GetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetState", (PyCFunction) _wrap_ListItem_GetState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetText", (PyCFunction) _wrap_ListItem_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetImage", (PyCFunction) _wrap_ListItem_GetImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetData", (PyCFunction) _wrap_ListItem_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetWidth", (PyCFunction) _wrap_ListItem_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetAlign", (PyCFunction) _wrap_ListItem_GetAlign, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetAttributes", (PyCFunction) _wrap_ListItem_GetAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_HasAttributes", (PyCFunction) _wrap_ListItem_HasAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetTextColour", (PyCFunction) _wrap_ListItem_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetBackgroundColour", (PyCFunction) _wrap_ListItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_GetFont", (PyCFunction) _wrap_ListItem_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_mask_set", (PyCFunction) _wrap_ListItem_m_mask_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_mask_get", (PyCFunction) _wrap_ListItem_m_mask_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_itemId_set", (PyCFunction) _wrap_ListItem_m_itemId_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_itemId_get", (PyCFunction) _wrap_ListItem_m_itemId_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_col_set", (PyCFunction) _wrap_ListItem_m_col_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_col_get", (PyCFunction) _wrap_ListItem_m_col_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_state_set", (PyCFunction) _wrap_ListItem_m_state_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_state_get", (PyCFunction) _wrap_ListItem_m_state_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_stateMask_set", (PyCFunction) _wrap_ListItem_m_stateMask_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_stateMask_get", (PyCFunction) _wrap_ListItem_m_stateMask_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_text_set", (PyCFunction) _wrap_ListItem_m_text_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_text_get", (PyCFunction) _wrap_ListItem_m_text_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_image_set", (PyCFunction) _wrap_ListItem_m_image_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_image_get", (PyCFunction) _wrap_ListItem_m_image_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_data_set", (PyCFunction) _wrap_ListItem_m_data_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_data_get", (PyCFunction) _wrap_ListItem_m_data_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_format_set", (PyCFunction) _wrap_ListItem_m_format_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_format_get", (PyCFunction) _wrap_ListItem_m_format_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_width_set", (PyCFunction) _wrap_ListItem_m_width_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_m_width_get", (PyCFunction) _wrap_ListItem_m_width_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListItem_swigregister", ListItem_swigregister, METH_VARARGS },
-        { (char *)"new_ListEvent", (PyCFunction) _wrap_new_ListEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_code_set", (PyCFunction) _wrap_ListEvent_m_code_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_code_get", (PyCFunction) _wrap_ListEvent_m_code_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_oldItemIndex_set", (PyCFunction) _wrap_ListEvent_m_oldItemIndex_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_oldItemIndex_get", (PyCFunction) _wrap_ListEvent_m_oldItemIndex_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_itemIndex_set", (PyCFunction) _wrap_ListEvent_m_itemIndex_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_itemIndex_get", (PyCFunction) _wrap_ListEvent_m_itemIndex_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_col_set", (PyCFunction) _wrap_ListEvent_m_col_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_col_get", (PyCFunction) _wrap_ListEvent_m_col_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_pointDrag_set", (PyCFunction) _wrap_ListEvent_m_pointDrag_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_pointDrag_get", (PyCFunction) _wrap_ListEvent_m_pointDrag_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_m_item_get", (PyCFunction) _wrap_ListEvent_m_item_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetKeyCode", (PyCFunction) _wrap_ListEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetIndex", (PyCFunction) _wrap_ListEvent_GetIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetColumn", (PyCFunction) _wrap_ListEvent_GetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetPoint", (PyCFunction) _wrap_ListEvent_GetPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetLabel", (PyCFunction) _wrap_ListEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetText", (PyCFunction) _wrap_ListEvent_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetImage", (PyCFunction) _wrap_ListEvent_GetImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetData", (PyCFunction) _wrap_ListEvent_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetMask", (PyCFunction) _wrap_ListEvent_GetMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetItem", (PyCFunction) _wrap_ListEvent_GetItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetCacheFrom", (PyCFunction) _wrap_ListEvent_GetCacheFrom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_GetCacheTo", (PyCFunction) _wrap_ListEvent_GetCacheTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_IsEditCancelled", (PyCFunction) _wrap_ListEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_SetEditCanceled", (PyCFunction) _wrap_ListEvent_SetEditCanceled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListEvent_swigregister", ListEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ListCtrl", (PyCFunction) _wrap_new_ListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreListCtrl", (PyCFunction) _wrap_new_PreListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_Create", (PyCFunction) _wrap_ListCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl__setCallbackInfo", (PyCFunction) _wrap_ListCtrl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetForegroundColour", (PyCFunction) _wrap_ListCtrl_SetForegroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetBackgroundColour", (PyCFunction) _wrap_ListCtrl_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetColumn", (PyCFunction) _wrap_ListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetColumn", (PyCFunction) _wrap_ListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetColumnWidth", (PyCFunction) _wrap_ListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetColumnWidth", (PyCFunction) _wrap_ListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetCountPerPage", (PyCFunction) _wrap_ListCtrl_GetCountPerPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetViewRect", (PyCFunction) _wrap_ListCtrl_GetViewRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItem", (PyCFunction) _wrap_ListCtrl_GetItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItem", (PyCFunction) _wrap_ListCtrl_SetItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetStringItem", (PyCFunction) _wrap_ListCtrl_SetStringItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemState", (PyCFunction) _wrap_ListCtrl_GetItemState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemState", (PyCFunction) _wrap_ListCtrl_SetItemState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemImage", (PyCFunction) _wrap_ListCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemText", (PyCFunction) _wrap_ListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemText", (PyCFunction) _wrap_ListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemData", (PyCFunction) _wrap_ListCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemData", (PyCFunction) _wrap_ListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemPosition", (PyCFunction) _wrap_ListCtrl_GetItemPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemRect", (PyCFunction) _wrap_ListCtrl_GetItemRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemPosition", (PyCFunction) _wrap_ListCtrl_SetItemPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemCount", (PyCFunction) _wrap_ListCtrl_GetItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetColumnCount", (PyCFunction) _wrap_ListCtrl_GetColumnCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemSpacing", (PyCFunction) _wrap_ListCtrl_GetItemSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemSpacing", (PyCFunction) _wrap_ListCtrl_SetItemSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetSelectedItemCount", (PyCFunction) _wrap_ListCtrl_GetSelectedItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetTextColour", (PyCFunction) _wrap_ListCtrl_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetTextColour", (PyCFunction) _wrap_ListCtrl_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetTopItem", (PyCFunction) _wrap_ListCtrl_GetTopItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetSingleStyle", (PyCFunction) _wrap_ListCtrl_SetSingleStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetWindowStyleFlag", (PyCFunction) _wrap_ListCtrl_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetNextItem", (PyCFunction) _wrap_ListCtrl_GetNextItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetImageList", (PyCFunction) _wrap_ListCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetImageList", (PyCFunction) _wrap_ListCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_AssignImageList", (PyCFunction) _wrap_ListCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InReportView", (PyCFunction) _wrap_ListCtrl_InReportView, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_IsVirtual", (PyCFunction) _wrap_ListCtrl_IsVirtual, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_RefreshItem", (PyCFunction) _wrap_ListCtrl_RefreshItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_RefreshItems", (PyCFunction) _wrap_ListCtrl_RefreshItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_Arrange", (PyCFunction) _wrap_ListCtrl_Arrange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_DeleteItem", (PyCFunction) _wrap_ListCtrl_DeleteItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_DeleteAllItems", (PyCFunction) _wrap_ListCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_DeleteColumn", (PyCFunction) _wrap_ListCtrl_DeleteColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_DeleteAllColumns", (PyCFunction) _wrap_ListCtrl_DeleteAllColumns, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_ClearAll", (PyCFunction) _wrap_ListCtrl_ClearAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_EditLabel", (PyCFunction) _wrap_ListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_EnsureVisible", (PyCFunction) _wrap_ListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_FindItem", (PyCFunction) _wrap_ListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_FindItemData", (PyCFunction) _wrap_ListCtrl_FindItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_FindItemAtPos", (PyCFunction) _wrap_ListCtrl_FindItemAtPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_HitTest", (PyCFunction) _wrap_ListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InsertItem", (PyCFunction) _wrap_ListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InsertStringItem", (PyCFunction) _wrap_ListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InsertImageItem", (PyCFunction) _wrap_ListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InsertImageStringItem", (PyCFunction) _wrap_ListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InsertColumnInfo", (PyCFunction) _wrap_ListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_InsertColumn", (PyCFunction) _wrap_ListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemCount", (PyCFunction) _wrap_ListCtrl_SetItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_ScrollList", (PyCFunction) _wrap_ListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemTextColour", (PyCFunction) _wrap_ListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemTextColour", (PyCFunction) _wrap_ListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_ListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_ListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_SortItems", (PyCFunction) _wrap_ListCtrl_SortItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetMainWindow", (PyCFunction) _wrap_ListCtrl_GetMainWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_ListCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListCtrl_swigregister", ListCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_ListView", (PyCFunction) _wrap_new_ListView, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreListView", (PyCFunction) _wrap_new_PreListView, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_Create", (PyCFunction) _wrap_ListView_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_Select", (PyCFunction) _wrap_ListView_Select, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_Focus", (PyCFunction) _wrap_ListView_Focus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_GetFocusedItem", (PyCFunction) _wrap_ListView_GetFocusedItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_GetNextSelected", (PyCFunction) _wrap_ListView_GetNextSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_GetFirstSelected", (PyCFunction) _wrap_ListView_GetFirstSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_IsSelected", (PyCFunction) _wrap_ListView_IsSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_SetColumnImage", (PyCFunction) _wrap_ListView_SetColumnImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_ClearColumnImage", (PyCFunction) _wrap_ListView_ClearColumnImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ListView_swigregister", ListView_swigregister, METH_VARARGS },
-        { (char *)"new_TreeItemId", (PyCFunction) _wrap_new_TreeItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_TreeItemId", (PyCFunction) _wrap_delete_TreeItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemId_IsOk", (PyCFunction) _wrap_TreeItemId_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemId___eq__", (PyCFunction) _wrap_TreeItemId___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemId___ne__", (PyCFunction) _wrap_TreeItemId___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemId_m_pItem_set", (PyCFunction) _wrap_TreeItemId_m_pItem_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemId_m_pItem_get", (PyCFunction) _wrap_TreeItemId_m_pItem_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemId_swigregister", TreeItemId_swigregister, METH_VARARGS },
-        { (char *)"new_TreeItemData", (PyCFunction) _wrap_new_TreeItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemData_GetData", (PyCFunction) _wrap_TreeItemData_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemData_SetData", (PyCFunction) _wrap_TreeItemData_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemData_GetId", (PyCFunction) _wrap_TreeItemData_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemData_SetId", (PyCFunction) _wrap_TreeItemData_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemData_Destroy", (PyCFunction) _wrap_TreeItemData_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeItemData_swigregister", TreeItemData_swigregister, METH_VARARGS },
-        { (char *)"new_TreeEvent", (PyCFunction) _wrap_new_TreeEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_GetItem", (PyCFunction) _wrap_TreeEvent_GetItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetItem", (PyCFunction) _wrap_TreeEvent_SetItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_GetOldItem", (PyCFunction) _wrap_TreeEvent_GetOldItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetOldItem", (PyCFunction) _wrap_TreeEvent_SetOldItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_GetPoint", (PyCFunction) _wrap_TreeEvent_GetPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetPoint", (PyCFunction) _wrap_TreeEvent_SetPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_GetKeyEvent", (PyCFunction) _wrap_TreeEvent_GetKeyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_GetKeyCode", (PyCFunction) _wrap_TreeEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetKeyEvent", (PyCFunction) _wrap_TreeEvent_SetKeyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_GetLabel", (PyCFunction) _wrap_TreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetLabel", (PyCFunction) _wrap_TreeEvent_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_IsEditCancelled", (PyCFunction) _wrap_TreeEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetEditCanceled", (PyCFunction) _wrap_TreeEvent_SetEditCanceled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_SetToolTip", (PyCFunction) _wrap_TreeEvent_SetToolTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeEvent_swigregister", TreeEvent_swigregister, METH_VARARGS },
-        { (char *)"new_TreeCtrl", (PyCFunction) _wrap_new_TreeCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreTreeCtrl", (PyCFunction) _wrap_new_PreTreeCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_Create", (PyCFunction) _wrap_TreeCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl__setCallbackInfo", (PyCFunction) _wrap_TreeCtrl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetCount", (PyCFunction) _wrap_TreeCtrl_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetIndent", (PyCFunction) _wrap_TreeCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetIndent", (PyCFunction) _wrap_TreeCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetSpacing", (PyCFunction) _wrap_TreeCtrl_GetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetSpacing", (PyCFunction) _wrap_TreeCtrl_SetSpacing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetImageList", (PyCFunction) _wrap_TreeCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetStateImageList", (PyCFunction) _wrap_TreeCtrl_GetStateImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetImageList", (PyCFunction) _wrap_TreeCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetStateImageList", (PyCFunction) _wrap_TreeCtrl_SetStateImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_AssignImageList", (PyCFunction) _wrap_TreeCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_AssignStateImageList", (PyCFunction) _wrap_TreeCtrl_AssignStateImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemText", (PyCFunction) _wrap_TreeCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemImage", (PyCFunction) _wrap_TreeCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemData", (PyCFunction) _wrap_TreeCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemPyData", (PyCFunction) _wrap_TreeCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemFont", (PyCFunction) _wrap_TreeCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemText", (PyCFunction) _wrap_TreeCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemImage", (PyCFunction) _wrap_TreeCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemData", (PyCFunction) _wrap_TreeCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemPyData", (PyCFunction) _wrap_TreeCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemBold", (PyCFunction) _wrap_TreeCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SetItemFont", (PyCFunction) _wrap_TreeCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_IsVisible", (PyCFunction) _wrap_TreeCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_IsExpanded", (PyCFunction) _wrap_TreeCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_IsSelected", (PyCFunction) _wrap_TreeCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_IsBold", (PyCFunction) _wrap_TreeCtrl_IsBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetChildrenCount", (PyCFunction) _wrap_TreeCtrl_GetChildrenCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetRootItem", (PyCFunction) _wrap_TreeCtrl_GetRootItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetSelection", (PyCFunction) _wrap_TreeCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetSelections", (PyCFunction) _wrap_TreeCtrl_GetSelections, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetItemParent", (PyCFunction) _wrap_TreeCtrl_GetItemParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetFirstChild", (PyCFunction) _wrap_TreeCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetNextChild", (PyCFunction) _wrap_TreeCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetLastChild", (PyCFunction) _wrap_TreeCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetNextSibling", (PyCFunction) _wrap_TreeCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetNextVisible", (PyCFunction) _wrap_TreeCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_AddRoot", (PyCFunction) _wrap_TreeCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_PrependItem", (PyCFunction) _wrap_TreeCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_InsertItem", (PyCFunction) _wrap_TreeCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_InsertItemBefore", (PyCFunction) _wrap_TreeCtrl_InsertItemBefore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_AppendItem", (PyCFunction) _wrap_TreeCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_Delete", (PyCFunction) _wrap_TreeCtrl_Delete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_DeleteChildren", (PyCFunction) _wrap_TreeCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_DeleteAllItems", (PyCFunction) _wrap_TreeCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_Expand", (PyCFunction) _wrap_TreeCtrl_Expand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_Collapse", (PyCFunction) _wrap_TreeCtrl_Collapse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_Toggle", (PyCFunction) _wrap_TreeCtrl_Toggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_Unselect", (PyCFunction) _wrap_TreeCtrl_Unselect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_UnselectItem", (PyCFunction) _wrap_TreeCtrl_UnselectItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_UnselectAll", (PyCFunction) _wrap_TreeCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SelectItem", (PyCFunction) _wrap_TreeCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_ToggleItemSelection", (PyCFunction) _wrap_TreeCtrl_ToggleItemSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_EnsureVisible", (PyCFunction) _wrap_TreeCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_ScrollTo", (PyCFunction) _wrap_TreeCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_EditLabel", (PyCFunction) _wrap_TreeCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetEditControl", (PyCFunction) _wrap_TreeCtrl_GetEditControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_SortChildren", (PyCFunction) _wrap_TreeCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_HitTest", (PyCFunction) _wrap_TreeCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_TreeCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TreeCtrl_swigregister", TreeCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_GenericDirCtrl", (PyCFunction) _wrap_new_GenericDirCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreGenericDirCtrl", (PyCFunction) _wrap_new_PreGenericDirCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_Create", (PyCFunction) _wrap_GenericDirCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_ExpandPath", (PyCFunction) _wrap_GenericDirCtrl_ExpandPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetDefaultPath", (PyCFunction) _wrap_GenericDirCtrl_GetDefaultPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_SetDefaultPath", (PyCFunction) _wrap_GenericDirCtrl_SetDefaultPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetPath", (PyCFunction) _wrap_GenericDirCtrl_GetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetFilePath", (PyCFunction) _wrap_GenericDirCtrl_GetFilePath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_SetPath", (PyCFunction) _wrap_GenericDirCtrl_SetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_ShowHidden", (PyCFunction) _wrap_GenericDirCtrl_ShowHidden, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetShowHidden", (PyCFunction) _wrap_GenericDirCtrl_GetShowHidden, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetFilter", (PyCFunction) _wrap_GenericDirCtrl_GetFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_SetFilter", (PyCFunction) _wrap_GenericDirCtrl_SetFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetFilterIndex", (PyCFunction) _wrap_GenericDirCtrl_GetFilterIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_SetFilterIndex", (PyCFunction) _wrap_GenericDirCtrl_SetFilterIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetRootId", (PyCFunction) _wrap_GenericDirCtrl_GetRootId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetTreeCtrl", (PyCFunction) _wrap_GenericDirCtrl_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_GetFilterListCtrl", (PyCFunction) _wrap_GenericDirCtrl_GetFilterListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_FindChild", (PyCFunction) _wrap_GenericDirCtrl_FindChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_DoResize", (PyCFunction) _wrap_GenericDirCtrl_DoResize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_ReCreateTree", (PyCFunction) _wrap_GenericDirCtrl_ReCreateTree, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericDirCtrl_swigregister", GenericDirCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_DirFilterListCtrl", (PyCFunction) _wrap_new_DirFilterListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreDirFilterListCtrl", (PyCFunction) _wrap_new_PreDirFilterListCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirFilterListCtrl_Create", (PyCFunction) _wrap_DirFilterListCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirFilterListCtrl_FillFilterList", (PyCFunction) _wrap_DirFilterListCtrl_FillFilterList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirFilterListCtrl_swigregister", DirFilterListCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_PyControl", (PyCFunction) _wrap_new_PyControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePyControl", (PyCFunction) _wrap_new_PrePyControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl__setCallbackInfo", (PyCFunction) _wrap_PyControl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_SetBestSize", (PyCFunction) _wrap_PyControl_SetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoMoveWindow", (PyCFunction) _wrap_PyControl_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoSetSize", (PyCFunction) _wrap_PyControl_base_DoSetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoSetClientSize", (PyCFunction) _wrap_PyControl_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoSetVirtualSize", (PyCFunction) _wrap_PyControl_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoGetSize", (PyCFunction) _wrap_PyControl_base_DoGetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoGetClientSize", (PyCFunction) _wrap_PyControl_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoGetPosition", (PyCFunction) _wrap_PyControl_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoGetVirtualSize", (PyCFunction) _wrap_PyControl_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_DoGetBestSize", (PyCFunction) _wrap_PyControl_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_InitDialog", (PyCFunction) _wrap_PyControl_base_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_TransferDataToWindow", (PyCFunction) _wrap_PyControl_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_TransferDataFromWindow", (PyCFunction) _wrap_PyControl_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_Validate", (PyCFunction) _wrap_PyControl_base_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_AcceptsFocus", (PyCFunction) _wrap_PyControl_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyControl_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_GetMaxSize", (PyCFunction) _wrap_PyControl_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_AddChild", (PyCFunction) _wrap_PyControl_base_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_RemoveChild", (PyCFunction) _wrap_PyControl_base_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_ShouldInheritColours", (PyCFunction) _wrap_PyControl_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyControl_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_base_GetDefaultAttributes", (PyCFunction) _wrap_PyControl_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyControl_swigregister", PyControl_swigregister, METH_VARARGS },
-        { (char *)"new_HelpEvent", (PyCFunction) _wrap_new_HelpEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_GetPosition", (PyCFunction) _wrap_HelpEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_SetPosition", (PyCFunction) _wrap_HelpEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_GetLink", (PyCFunction) _wrap_HelpEvent_GetLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_SetLink", (PyCFunction) _wrap_HelpEvent_SetLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_GetTarget", (PyCFunction) _wrap_HelpEvent_GetTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_SetTarget", (PyCFunction) _wrap_HelpEvent_SetTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpEvent_swigregister", HelpEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ContextHelp", (PyCFunction) _wrap_new_ContextHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ContextHelp", (PyCFunction) _wrap_delete_ContextHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextHelp_BeginContextHelp", (PyCFunction) _wrap_ContextHelp_BeginContextHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextHelp_EndContextHelp", (PyCFunction) _wrap_ContextHelp_EndContextHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextHelp_swigregister", ContextHelp_swigregister, METH_VARARGS },
-        { (char *)"new_ContextHelpButton", (PyCFunction) _wrap_new_ContextHelpButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextHelpButton_swigregister", ContextHelpButton_swigregister, METH_VARARGS },
-        { (char *)"HelpProvider_Set", (PyCFunction) _wrap_HelpProvider_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_Get", (PyCFunction) _wrap_HelpProvider_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_GetHelp", (PyCFunction) _wrap_HelpProvider_GetHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_ShowHelp", (PyCFunction) _wrap_HelpProvider_ShowHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_AddHelp", (PyCFunction) _wrap_HelpProvider_AddHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_AddHelpById", (PyCFunction) _wrap_HelpProvider_AddHelpById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_RemoveHelp", (PyCFunction) _wrap_HelpProvider_RemoveHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_Destroy", (PyCFunction) _wrap_HelpProvider_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HelpProvider_swigregister", HelpProvider_swigregister, METH_VARARGS },
-        { (char *)"new_SimpleHelpProvider", (PyCFunction) _wrap_new_SimpleHelpProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SimpleHelpProvider_swigregister", SimpleHelpProvider_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 },
-        { NULL, NULL }
+        { (char *)"new_Button", (PyCFunction) _wrap_new_Button, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreButton", (PyCFunction) _wrap_new_PreButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Button_Create", (PyCFunction) _wrap_Button_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Button_SetDefault", (PyCFunction) _wrap_Button_SetDefault, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Button_GetDefaultSize", (PyCFunction) _wrap_Button_GetDefaultSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Button_GetClassDefaultAttributes", (PyCFunction) _wrap_Button_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Button_swigregister", Button_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BitmapButton", (PyCFunction) _wrap_new_BitmapButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreBitmapButton", (PyCFunction) _wrap_new_PreBitmapButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_Create", (PyCFunction) _wrap_BitmapButton_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_GetBitmapLabel", (PyCFunction) _wrap_BitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_GetBitmapFocus", (PyCFunction) _wrap_BitmapButton_GetBitmapFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_GetBitmapSelected", (PyCFunction) _wrap_BitmapButton_GetBitmapSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_SetBitmapDisabled", (PyCFunction) _wrap_BitmapButton_SetBitmapDisabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_SetBitmapFocus", (PyCFunction) _wrap_BitmapButton_SetBitmapFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_SetBitmapSelected", (PyCFunction) _wrap_BitmapButton_SetBitmapSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_SetBitmapLabel", (PyCFunction) _wrap_BitmapButton_SetBitmapLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_SetMargins", (PyCFunction) _wrap_BitmapButton_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_GetMarginX", (PyCFunction) _wrap_BitmapButton_GetMarginX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_GetMarginY", (PyCFunction) _wrap_BitmapButton_GetMarginY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapButton_swigregister", BitmapButton_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CheckBox", (PyCFunction) _wrap_new_CheckBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreCheckBox", (PyCFunction) _wrap_new_PreCheckBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_Create", (PyCFunction) _wrap_CheckBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_GetValue", (PyCFunction) _wrap_CheckBox_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_IsChecked", (PyCFunction) _wrap_CheckBox_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_SetValue", (PyCFunction) _wrap_CheckBox_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_Get3StateValue", (PyCFunction) _wrap_CheckBox_Get3StateValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_Set3StateValue", (PyCFunction) _wrap_CheckBox_Set3StateValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_Is3State", (PyCFunction) _wrap_CheckBox_Is3State, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_Is3rdStateAllowedForUser", (PyCFunction) _wrap_CheckBox_Is3rdStateAllowedForUser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_GetClassDefaultAttributes", (PyCFunction) _wrap_CheckBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckBox_swigregister", CheckBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Choice", (PyCFunction) _wrap_new_Choice, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreChoice", (PyCFunction) _wrap_new_PreChoice, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Choice_Create", (PyCFunction) _wrap_Choice_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Choice_SetSelection", (PyCFunction) _wrap_Choice_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Choice_SetStringSelection", (PyCFunction) _wrap_Choice_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Choice_SetString", (PyCFunction) _wrap_Choice_SetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Choice_GetClassDefaultAttributes", (PyCFunction) _wrap_Choice_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Choice_swigregister", Choice_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ComboBox", (PyCFunction) _wrap_new_ComboBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreComboBox", (PyCFunction) _wrap_new_PreComboBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_Create", (PyCFunction) _wrap_ComboBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_GetValue", (PyCFunction) _wrap_ComboBox_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetValue", (PyCFunction) _wrap_ComboBox_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_Copy", (PyCFunction) _wrap_ComboBox_Copy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_Cut", (PyCFunction) _wrap_ComboBox_Cut, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_Paste", (PyCFunction) _wrap_ComboBox_Paste, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetInsertionPoint", (PyCFunction) _wrap_ComboBox_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_GetInsertionPoint", (PyCFunction) _wrap_ComboBox_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_GetLastPosition", (PyCFunction) _wrap_ComboBox_GetLastPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_Replace", (PyCFunction) _wrap_ComboBox_Replace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetSelection", (PyCFunction) _wrap_ComboBox_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetMark", (PyCFunction) _wrap_ComboBox_SetMark, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetStringSelection", (PyCFunction) _wrap_ComboBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetString", (PyCFunction) _wrap_ComboBox_SetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetEditable", (PyCFunction) _wrap_ComboBox_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_SetInsertionPointEnd", (PyCFunction) _wrap_ComboBox_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_Remove", (PyCFunction) _wrap_ComboBox_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_GetClassDefaultAttributes", (PyCFunction) _wrap_ComboBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ComboBox_swigregister", ComboBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Gauge", (PyCFunction) _wrap_new_Gauge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreGauge", (PyCFunction) _wrap_new_PreGauge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_Create", (PyCFunction) _wrap_Gauge_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_SetRange", (PyCFunction) _wrap_Gauge_SetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_GetRange", (PyCFunction) _wrap_Gauge_GetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_SetValue", (PyCFunction) _wrap_Gauge_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_GetValue", (PyCFunction) _wrap_Gauge_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_IsVertical", (PyCFunction) _wrap_Gauge_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_SetShadowWidth", (PyCFunction) _wrap_Gauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_GetShadowWidth", (PyCFunction) _wrap_Gauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_SetBezelFace", (PyCFunction) _wrap_Gauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_GetBezelFace", (PyCFunction) _wrap_Gauge_GetBezelFace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_GetClassDefaultAttributes", (PyCFunction) _wrap_Gauge_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Gauge_swigregister", Gauge_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StaticBox", (PyCFunction) _wrap_new_StaticBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreStaticBox", (PyCFunction) _wrap_new_PreStaticBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBox_Create", (PyCFunction) _wrap_StaticBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBox_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBox_swigregister", StaticBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StaticLine", (PyCFunction) _wrap_new_StaticLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreStaticLine", (PyCFunction) _wrap_new_PreStaticLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticLine_Create", (PyCFunction) _wrap_StaticLine_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticLine_IsVertical", (PyCFunction) _wrap_StaticLine_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticLine_GetDefaultSize", (PyCFunction) _wrap_StaticLine_GetDefaultSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticLine_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticLine_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticLine_swigregister", StaticLine_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StaticText", (PyCFunction) _wrap_new_StaticText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreStaticText", (PyCFunction) _wrap_new_PreStaticText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticText_Create", (PyCFunction) _wrap_StaticText_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticText_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticText_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticText_swigregister", StaticText_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StaticBitmap", (PyCFunction) _wrap_new_StaticBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreStaticBitmap", (PyCFunction) _wrap_new_PreStaticBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBitmap_Create", (PyCFunction) _wrap_StaticBitmap_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBitmap_GetBitmap", (PyCFunction) _wrap_StaticBitmap_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBitmap_SetBitmap", (PyCFunction) _wrap_StaticBitmap_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBitmap_SetIcon", (PyCFunction) _wrap_StaticBitmap_SetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBitmap_GetClassDefaultAttributes", (PyCFunction) _wrap_StaticBitmap_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBitmap_swigregister", StaticBitmap_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListBox", (PyCFunction) _wrap_new_ListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreListBox", (PyCFunction) _wrap_new_PreListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_Create", (PyCFunction) _wrap_ListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_Insert", (PyCFunction) _wrap_ListBox_Insert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_InsertItems", (PyCFunction) _wrap_ListBox_InsertItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_Set", (PyCFunction) _wrap_ListBox_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_IsSelected", (PyCFunction) _wrap_ListBox_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetSelection", (PyCFunction) _wrap_ListBox_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_Select", (PyCFunction) _wrap_ListBox_Select, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_Deselect", (PyCFunction) _wrap_ListBox_Deselect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_DeselectAll", (PyCFunction) _wrap_ListBox_DeselectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetStringSelection", (PyCFunction) _wrap_ListBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_GetSelections", (PyCFunction) _wrap_ListBox_GetSelections, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetFirstItem", (PyCFunction) _wrap_ListBox_SetFirstItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetFirstItemStr", (PyCFunction) _wrap_ListBox_SetFirstItemStr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_EnsureVisible", (PyCFunction) _wrap_ListBox_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_AppendAndEnsureVisible", (PyCFunction) _wrap_ListBox_AppendAndEnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_IsSorted", (PyCFunction) _wrap_ListBox_IsSorted, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetItemForegroundColour", (PyCFunction) _wrap_ListBox_SetItemForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetItemBackgroundColour", (PyCFunction) _wrap_ListBox_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_SetItemFont", (PyCFunction) _wrap_ListBox_SetItemFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_GetClassDefaultAttributes", (PyCFunction) _wrap_ListBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListBox_swigregister", ListBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CheckListBox", (PyCFunction) _wrap_new_CheckListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreCheckListBox", (PyCFunction) _wrap_new_PreCheckListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckListBox_Create", (PyCFunction) _wrap_CheckListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckListBox_IsChecked", (PyCFunction) _wrap_CheckListBox_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckListBox_Check", (PyCFunction) _wrap_CheckListBox_Check, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckListBox_HitTest", (PyCFunction) _wrap_CheckListBox_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckListBox_HitTestXY", (PyCFunction) _wrap_CheckListBox_HitTestXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CheckListBox_swigregister", CheckListBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_TextAttr", (PyCFunction) _wrap_delete_TextAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_Init", (PyCFunction) _wrap_TextAttr_Init, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetFont", (PyCFunction) _wrap_TextAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetAlignment", (PyCFunction) _wrap_TextAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetTabs", (PyCFunction) _wrap_TextAttr_SetTabs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetLeftIndent", (PyCFunction) _wrap_TextAttr_SetLeftIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetRightIndent", (PyCFunction) _wrap_TextAttr_SetRightIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_SetFlags", (PyCFunction) _wrap_TextAttr_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasTextColour", (PyCFunction) _wrap_TextAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasBackgroundColour", (PyCFunction) _wrap_TextAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasFont", (PyCFunction) _wrap_TextAttr_HasFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasAlignment", (PyCFunction) _wrap_TextAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasTabs", (PyCFunction) _wrap_TextAttr_HasTabs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasLeftIndent", (PyCFunction) _wrap_TextAttr_HasLeftIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasRightIndent", (PyCFunction) _wrap_TextAttr_HasRightIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_HasFlag", (PyCFunction) _wrap_TextAttr_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetTextColour", (PyCFunction) _wrap_TextAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetBackgroundColour", (PyCFunction) _wrap_TextAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetFont", (PyCFunction) _wrap_TextAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetAlignment", (PyCFunction) _wrap_TextAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetTabs", (PyCFunction) _wrap_TextAttr_GetTabs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetLeftIndent", (PyCFunction) _wrap_TextAttr_GetLeftIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetLeftSubIndent", (PyCFunction) _wrap_TextAttr_GetLeftSubIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetRightIndent", (PyCFunction) _wrap_TextAttr_GetRightIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_GetFlags", (PyCFunction) _wrap_TextAttr_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_IsDefault", (PyCFunction) _wrap_TextAttr_IsDefault, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_Combine", (PyCFunction) _wrap_TextAttr_Combine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextAttr_swigregister", TextAttr_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TextCtrl", (PyCFunction) _wrap_new_TextCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreTextCtrl", (PyCFunction) _wrap_new_PreTextCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Create", (PyCFunction) _wrap_TextCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetValue", (PyCFunction) _wrap_TextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetValue", (PyCFunction) _wrap_TextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetRange", (PyCFunction) _wrap_TextCtrl_GetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetLineLength", (PyCFunction) _wrap_TextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetLineText", (PyCFunction) _wrap_TextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetNumberOfLines", (PyCFunction) _wrap_TextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_IsModified", (PyCFunction) _wrap_TextCtrl_IsModified, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_IsEditable", (PyCFunction) _wrap_TextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_IsSingleLine", (PyCFunction) _wrap_TextCtrl_IsSingleLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_IsMultiLine", (PyCFunction) _wrap_TextCtrl_IsMultiLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetSelection", (PyCFunction) _wrap_TextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetStringSelection", (PyCFunction) _wrap_TextCtrl_GetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Clear", (PyCFunction) _wrap_TextCtrl_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Replace", (PyCFunction) _wrap_TextCtrl_Replace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Remove", (PyCFunction) _wrap_TextCtrl_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_LoadFile", (PyCFunction) _wrap_TextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SaveFile", (PyCFunction) _wrap_TextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_MarkDirty", (PyCFunction) _wrap_TextCtrl_MarkDirty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_DiscardEdits", (PyCFunction) _wrap_TextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetMaxLength", (PyCFunction) _wrap_TextCtrl_SetMaxLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_WriteText", (PyCFunction) _wrap_TextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_AppendText", (PyCFunction) _wrap_TextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_EmulateKeyPress", (PyCFunction) _wrap_TextCtrl_EmulateKeyPress, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetStyle", (PyCFunction) _wrap_TextCtrl_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetStyle", (PyCFunction) _wrap_TextCtrl_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetDefaultStyle", (PyCFunction) _wrap_TextCtrl_SetDefaultStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetDefaultStyle", (PyCFunction) _wrap_TextCtrl_GetDefaultStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_XYToPosition", (PyCFunction) _wrap_TextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_PositionToXY", (PyCFunction) _wrap_TextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_ShowPosition", (PyCFunction) _wrap_TextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_HitTest", (PyCFunction) _wrap_TextCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_HitTestPos", (PyCFunction) _wrap_TextCtrl_HitTestPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Copy", (PyCFunction) _wrap_TextCtrl_Copy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Cut", (PyCFunction) _wrap_TextCtrl_Cut, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Paste", (PyCFunction) _wrap_TextCtrl_Paste, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_CanCopy", (PyCFunction) _wrap_TextCtrl_CanCopy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_CanCut", (PyCFunction) _wrap_TextCtrl_CanCut, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_CanPaste", (PyCFunction) _wrap_TextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Undo", (PyCFunction) _wrap_TextCtrl_Undo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_Redo", (PyCFunction) _wrap_TextCtrl_Redo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_CanUndo", (PyCFunction) _wrap_TextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_CanRedo", (PyCFunction) _wrap_TextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetInsertionPoint", (PyCFunction) _wrap_TextCtrl_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetInsertionPointEnd", (PyCFunction) _wrap_TextCtrl_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetInsertionPoint", (PyCFunction) _wrap_TextCtrl_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetLastPosition", (PyCFunction) _wrap_TextCtrl_GetLastPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetSelection", (PyCFunction) _wrap_TextCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SelectAll", (PyCFunction) _wrap_TextCtrl_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_SetEditable", (PyCFunction) _wrap_TextCtrl_SetEditable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_write", (PyCFunction) _wrap_TextCtrl_write, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetString", (PyCFunction) _wrap_TextCtrl_GetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_TextCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextCtrl_swigregister", TextCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TextUrlEvent", (PyCFunction) _wrap_new_TextUrlEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextUrlEvent_GetMouseEvent", (PyCFunction) _wrap_TextUrlEvent_GetMouseEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextUrlEvent_GetURLStart", (PyCFunction) _wrap_TextUrlEvent_GetURLStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextUrlEvent_GetURLEnd", (PyCFunction) _wrap_TextUrlEvent_GetURLEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextUrlEvent_swigregister", TextUrlEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ScrollBar", (PyCFunction) _wrap_new_ScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreScrollBar", (PyCFunction) _wrap_new_PreScrollBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_Create", (PyCFunction) _wrap_ScrollBar_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_GetThumbPosition", (PyCFunction) _wrap_ScrollBar_GetThumbPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_GetThumbSize", (PyCFunction) _wrap_ScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_GetPageSize", (PyCFunction) _wrap_ScrollBar_GetPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_GetRange", (PyCFunction) _wrap_ScrollBar_GetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_IsVertical", (PyCFunction) _wrap_ScrollBar_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_SetThumbPosition", (PyCFunction) _wrap_ScrollBar_SetThumbPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_SetScrollbar", (PyCFunction) _wrap_ScrollBar_SetScrollbar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ScrollBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollBar_swigregister", ScrollBar_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SpinButton", (PyCFunction) _wrap_new_SpinButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSpinButton", (PyCFunction) _wrap_new_PreSpinButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_Create", (PyCFunction) _wrap_SpinButton_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_GetValue", (PyCFunction) _wrap_SpinButton_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_GetMin", (PyCFunction) _wrap_SpinButton_GetMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_GetMax", (PyCFunction) _wrap_SpinButton_GetMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_SetValue", (PyCFunction) _wrap_SpinButton_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_SetMin", (PyCFunction) _wrap_SpinButton_SetMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_SetMax", (PyCFunction) _wrap_SpinButton_SetMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_SetRange", (PyCFunction) _wrap_SpinButton_SetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_IsVertical", (PyCFunction) _wrap_SpinButton_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_GetClassDefaultAttributes", (PyCFunction) _wrap_SpinButton_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinButton_swigregister", SpinButton_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SpinCtrl", (PyCFunction) _wrap_new_SpinCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSpinCtrl", (PyCFunction) _wrap_new_PreSpinCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_Create", (PyCFunction) _wrap_SpinCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_GetValue", (PyCFunction) _wrap_SpinCtrl_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_SetValue", (PyCFunction) _wrap_SpinCtrl_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_SetValueString", (PyCFunction) _wrap_SpinCtrl_SetValueString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_SetRange", (PyCFunction) _wrap_SpinCtrl_SetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_GetMin", (PyCFunction) _wrap_SpinCtrl_GetMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_GetMax", (PyCFunction) _wrap_SpinCtrl_GetMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_SetSelection", (PyCFunction) _wrap_SpinCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_SpinCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinCtrl_swigregister", SpinCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SpinEvent", (PyCFunction) _wrap_new_SpinEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinEvent_GetPosition", (PyCFunction) _wrap_SpinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinEvent_SetPosition", (PyCFunction) _wrap_SpinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SpinEvent_swigregister", SpinEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_RadioBox", (PyCFunction) _wrap_new_RadioBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreRadioBox", (PyCFunction) _wrap_new_PreRadioBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_Create", (PyCFunction) _wrap_RadioBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_SetSelection", (PyCFunction) _wrap_RadioBox_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetSelection", (PyCFunction) _wrap_RadioBox_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetStringSelection", (PyCFunction) _wrap_RadioBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_SetStringSelection", (PyCFunction) _wrap_RadioBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetCount", (PyCFunction) _wrap_RadioBox_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_FindString", (PyCFunction) _wrap_RadioBox_FindString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetString", (PyCFunction) _wrap_RadioBox_GetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_SetString", (PyCFunction) _wrap_RadioBox_SetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_EnableItem", (PyCFunction) _wrap_RadioBox_EnableItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_ShowItem", (PyCFunction) _wrap_RadioBox_ShowItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetColumnCount", (PyCFunction) _wrap_RadioBox_GetColumnCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetRowCount", (PyCFunction) _wrap_RadioBox_GetRowCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetNextItem", (PyCFunction) _wrap_RadioBox_GetNextItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_GetClassDefaultAttributes", (PyCFunction) _wrap_RadioBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioBox_swigregister", RadioBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_RadioButton", (PyCFunction) _wrap_new_RadioButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreRadioButton", (PyCFunction) _wrap_new_PreRadioButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioButton_Create", (PyCFunction) _wrap_RadioButton_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioButton_GetValue", (PyCFunction) _wrap_RadioButton_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioButton_SetValue", (PyCFunction) _wrap_RadioButton_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioButton_GetClassDefaultAttributes", (PyCFunction) _wrap_RadioButton_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RadioButton_swigregister", RadioButton_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Slider", (PyCFunction) _wrap_new_Slider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSlider", (PyCFunction) _wrap_new_PreSlider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_Create", (PyCFunction) _wrap_Slider_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetValue", (PyCFunction) _wrap_Slider_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetValue", (PyCFunction) _wrap_Slider_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetRange", (PyCFunction) _wrap_Slider_SetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetMin", (PyCFunction) _wrap_Slider_GetMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetMax", (PyCFunction) _wrap_Slider_GetMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetMin", (PyCFunction) _wrap_Slider_SetMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetMax", (PyCFunction) _wrap_Slider_SetMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetLineSize", (PyCFunction) _wrap_Slider_SetLineSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetPageSize", (PyCFunction) _wrap_Slider_SetPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetLineSize", (PyCFunction) _wrap_Slider_GetLineSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetPageSize", (PyCFunction) _wrap_Slider_GetPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetThumbLength", (PyCFunction) _wrap_Slider_SetThumbLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetThumbLength", (PyCFunction) _wrap_Slider_GetThumbLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetTickFreq", (PyCFunction) _wrap_Slider_SetTickFreq, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetTickFreq", (PyCFunction) _wrap_Slider_GetTickFreq, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_ClearTicks", (PyCFunction) _wrap_Slider_ClearTicks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetTick", (PyCFunction) _wrap_Slider_SetTick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_ClearSel", (PyCFunction) _wrap_Slider_ClearSel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetSelEnd", (PyCFunction) _wrap_Slider_GetSelEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetSelStart", (PyCFunction) _wrap_Slider_GetSelStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_SetSelection", (PyCFunction) _wrap_Slider_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_GetClassDefaultAttributes", (PyCFunction) _wrap_Slider_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Slider_swigregister", Slider_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ToggleButton", (PyCFunction) _wrap_new_ToggleButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreToggleButton", (PyCFunction) _wrap_new_PreToggleButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToggleButton_Create", (PyCFunction) _wrap_ToggleButton_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToggleButton_SetValue", (PyCFunction) _wrap_ToggleButton_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToggleButton_GetValue", (PyCFunction) _wrap_ToggleButton_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToggleButton_SetLabel", (PyCFunction) _wrap_ToggleButton_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToggleButton_GetClassDefaultAttributes", (PyCFunction) _wrap_ToggleButton_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToggleButton_swigregister", ToggleButton_swigregister, METH_VARARGS, NULL },
+        { (char *)"BookCtrl_GetPageCount", (PyCFunction) _wrap_BookCtrl_GetPageCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_GetPage", (PyCFunction) _wrap_BookCtrl_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_GetSelection", (PyCFunction) _wrap_BookCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_SetPageText", (PyCFunction) _wrap_BookCtrl_SetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_GetPageText", (PyCFunction) _wrap_BookCtrl_GetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_SetImageList", (PyCFunction) _wrap_BookCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_AssignImageList", (PyCFunction) _wrap_BookCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_GetImageList", (PyCFunction) _wrap_BookCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_GetPageImage", (PyCFunction) _wrap_BookCtrl_GetPageImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_SetPageImage", (PyCFunction) _wrap_BookCtrl_SetPageImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_SetPageSize", (PyCFunction) _wrap_BookCtrl_SetPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_CalcSizeFromPage", (PyCFunction) _wrap_BookCtrl_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_DeletePage", (PyCFunction) _wrap_BookCtrl_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_RemovePage", (PyCFunction) _wrap_BookCtrl_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_DeleteAllPages", (PyCFunction) _wrap_BookCtrl_DeleteAllPages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_AddPage", (PyCFunction) _wrap_BookCtrl_AddPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_InsertPage", (PyCFunction) _wrap_BookCtrl_InsertPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_SetSelection", (PyCFunction) _wrap_BookCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_AdvanceSelection", (PyCFunction) _wrap_BookCtrl_AdvanceSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_BookCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrl_swigregister", BookCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BookCtrlEvent", (PyCFunction) _wrap_new_BookCtrlEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlEvent_GetSelection", (PyCFunction) _wrap_BookCtrlEvent_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlEvent_SetSelection", (PyCFunction) _wrap_BookCtrlEvent_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlEvent_GetOldSelection", (PyCFunction) _wrap_BookCtrlEvent_GetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlEvent_SetOldSelection", (PyCFunction) _wrap_BookCtrlEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlEvent_swigregister", BookCtrlEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Notebook", (PyCFunction) _wrap_new_Notebook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreNotebook", (PyCFunction) _wrap_new_PreNotebook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_Create", (PyCFunction) _wrap_Notebook_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_GetRowCount", (PyCFunction) _wrap_Notebook_GetRowCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_SetPadding", (PyCFunction) _wrap_Notebook_SetPadding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_SetTabSize", (PyCFunction) _wrap_Notebook_SetTabSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_HitTest", (PyCFunction) _wrap_Notebook_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_CalcSizeFromPage", (PyCFunction) _wrap_Notebook_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_GetClassDefaultAttributes", (PyCFunction) _wrap_Notebook_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Notebook_swigregister", Notebook_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_NotebookEvent", (PyCFunction) _wrap_new_NotebookEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotebookEvent_swigregister", NotebookEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Listbook", (PyCFunction) _wrap_new_Listbook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreListbook", (PyCFunction) _wrap_new_PreListbook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Listbook_Create", (PyCFunction) _wrap_Listbook_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Listbook_IsVertical", (PyCFunction) _wrap_Listbook_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Listbook_swigregister", Listbook_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListbookEvent", (PyCFunction) _wrap_new_ListbookEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListbookEvent_swigregister", ListbookEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BookCtrlSizer", (PyCFunction) _wrap_new_BookCtrlSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlSizer_RecalcSizes", (PyCFunction) _wrap_BookCtrlSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlSizer_CalcMin", (PyCFunction) _wrap_BookCtrlSizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlSizer_GetControl", (PyCFunction) _wrap_BookCtrlSizer_GetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BookCtrlSizer_swigregister", BookCtrlSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_NotebookSizer", (PyCFunction) _wrap_new_NotebookSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotebookSizer_RecalcSizes", (PyCFunction) _wrap_NotebookSizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotebookSizer_CalcMin", (PyCFunction) _wrap_NotebookSizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotebookSizer_GetNotebook", (PyCFunction) _wrap_NotebookSizer_GetNotebook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotebookSizer_swigregister", NotebookSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"ToolBarToolBase_GetId", (PyCFunction) _wrap_ToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetControl", (PyCFunction) _wrap_ToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetToolBar", (PyCFunction) _wrap_ToolBarToolBase_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_IsButton", (PyCFunction) _wrap_ToolBarToolBase_IsButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_IsControl", (PyCFunction) _wrap_ToolBarToolBase_IsControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_IsSeparator", (PyCFunction) _wrap_ToolBarToolBase_IsSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetStyle", (PyCFunction) _wrap_ToolBarToolBase_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetKind", (PyCFunction) _wrap_ToolBarToolBase_GetKind, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_IsEnabled", (PyCFunction) _wrap_ToolBarToolBase_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_IsToggled", (PyCFunction) _wrap_ToolBarToolBase_IsToggled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_CanBeToggled", (PyCFunction) _wrap_ToolBarToolBase_CanBeToggled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetNormalBitmap", (PyCFunction) _wrap_ToolBarToolBase_GetNormalBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetDisabledBitmap", (PyCFunction) _wrap_ToolBarToolBase_GetDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetBitmap", (PyCFunction) _wrap_ToolBarToolBase_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetLabel", (PyCFunction) _wrap_ToolBarToolBase_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetShortHelp", (PyCFunction) _wrap_ToolBarToolBase_GetShortHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetLongHelp", (PyCFunction) _wrap_ToolBarToolBase_GetLongHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_Enable", (PyCFunction) _wrap_ToolBarToolBase_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_Toggle", (PyCFunction) _wrap_ToolBarToolBase_Toggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetToggle", (PyCFunction) _wrap_ToolBarToolBase_SetToggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetShortHelp", (PyCFunction) _wrap_ToolBarToolBase_SetShortHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetLongHelp", (PyCFunction) _wrap_ToolBarToolBase_SetLongHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetNormalBitmap", (PyCFunction) _wrap_ToolBarToolBase_SetNormalBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetDisabledBitmap", (PyCFunction) _wrap_ToolBarToolBase_SetDisabledBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetLabel", (PyCFunction) _wrap_ToolBarToolBase_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_Detach", (PyCFunction) _wrap_ToolBarToolBase_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_Attach", (PyCFunction) _wrap_ToolBarToolBase_Attach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_GetClientData", (PyCFunction) _wrap_ToolBarToolBase_GetClientData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_SetClientData", (PyCFunction) _wrap_ToolBarToolBase_SetClientData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarToolBase_swigregister", ToolBarToolBase_swigregister, METH_VARARGS, NULL },
+        { (char *)"ToolBarBase_DoAddTool", (PyCFunction) _wrap_ToolBarBase_DoAddTool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_DoInsertTool", (PyCFunction) _wrap_ToolBarBase_DoInsertTool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_AddToolItem", (PyCFunction) _wrap_ToolBarBase_AddToolItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_InsertToolItem", (PyCFunction) _wrap_ToolBarBase_InsertToolItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_AddControl", (PyCFunction) _wrap_ToolBarBase_AddControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_InsertControl", (PyCFunction) _wrap_ToolBarBase_InsertControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_FindControl", (PyCFunction) _wrap_ToolBarBase_FindControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_AddSeparator", (PyCFunction) _wrap_ToolBarBase_AddSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_InsertSeparator", (PyCFunction) _wrap_ToolBarBase_InsertSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_RemoveTool", (PyCFunction) _wrap_ToolBarBase_RemoveTool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_DeleteToolByPos", (PyCFunction) _wrap_ToolBarBase_DeleteToolByPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_DeleteTool", (PyCFunction) _wrap_ToolBarBase_DeleteTool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_ClearTools", (PyCFunction) _wrap_ToolBarBase_ClearTools, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_Realize", (PyCFunction) _wrap_ToolBarBase_Realize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_EnableTool", (PyCFunction) _wrap_ToolBarBase_EnableTool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_ToggleTool", (PyCFunction) _wrap_ToolBarBase_ToggleTool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToggle", (PyCFunction) _wrap_ToolBarBase_SetToggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolClientData", (PyCFunction) _wrap_ToolBarBase_GetToolClientData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToolClientData", (PyCFunction) _wrap_ToolBarBase_SetToolClientData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolPos", (PyCFunction) _wrap_ToolBarBase_GetToolPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolState", (PyCFunction) _wrap_ToolBarBase_GetToolState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolEnabled", (PyCFunction) _wrap_ToolBarBase_GetToolEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToolShortHelp", (PyCFunction) _wrap_ToolBarBase_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolShortHelp", (PyCFunction) _wrap_ToolBarBase_GetToolShortHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToolLongHelp", (PyCFunction) _wrap_ToolBarBase_SetToolLongHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolLongHelp", (PyCFunction) _wrap_ToolBarBase_GetToolLongHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetMarginsXY", (PyCFunction) _wrap_ToolBarBase_SetMarginsXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetMargins", (PyCFunction) _wrap_ToolBarBase_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToolPacking", (PyCFunction) _wrap_ToolBarBase_SetToolPacking, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToolSeparation", (PyCFunction) _wrap_ToolBarBase_SetToolSeparation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolMargins", (PyCFunction) _wrap_ToolBarBase_GetToolMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetMargins", (PyCFunction) _wrap_ToolBarBase_GetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolPacking", (PyCFunction) _wrap_ToolBarBase_GetToolPacking, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolSeparation", (PyCFunction) _wrap_ToolBarBase_GetToolSeparation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetRows", (PyCFunction) _wrap_ToolBarBase_SetRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetMaxRowsCols", (PyCFunction) _wrap_ToolBarBase_SetMaxRowsCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetMaxRows", (PyCFunction) _wrap_ToolBarBase_GetMaxRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetMaxCols", (PyCFunction) _wrap_ToolBarBase_GetMaxCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_SetToolBitmapSize", (PyCFunction) _wrap_ToolBarBase_SetToolBitmapSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolBitmapSize", (PyCFunction) _wrap_ToolBarBase_GetToolBitmapSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_GetToolSize", (PyCFunction) _wrap_ToolBarBase_GetToolSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_FindToolForPosition", (PyCFunction) _wrap_ToolBarBase_FindToolForPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_FindById", (PyCFunction) _wrap_ToolBarBase_FindById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_IsVertical", (PyCFunction) _wrap_ToolBarBase_IsVertical, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBarBase_swigregister", ToolBarBase_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreToolBar", (PyCFunction) _wrap_new_PreToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBar_FindToolForPosition", (PyCFunction) _wrap_ToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListItemAttr", (PyCFunction) _wrap_new_ListItemAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_SetTextColour", (PyCFunction) _wrap_ListItemAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_SetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_SetFont", (PyCFunction) _wrap_ListItemAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_HasTextColour", (PyCFunction) _wrap_ListItemAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_HasBackgroundColour", (PyCFunction) _wrap_ListItemAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_HasFont", (PyCFunction) _wrap_ListItemAttr_HasFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_GetTextColour", (PyCFunction) _wrap_ListItemAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_GetBackgroundColour", (PyCFunction) _wrap_ListItemAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_GetFont", (PyCFunction) _wrap_ListItemAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_Destroy", (PyCFunction) _wrap_ListItemAttr_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItemAttr_swigregister", ListItemAttr_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListItem", (PyCFunction) _wrap_new_ListItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ListItem", (PyCFunction) _wrap_delete_ListItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_Clear", (PyCFunction) _wrap_ListItem_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_ClearAttributes", (PyCFunction) _wrap_ListItem_ClearAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetMask", (PyCFunction) _wrap_ListItem_SetMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetId", (PyCFunction) _wrap_ListItem_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetColumn", (PyCFunction) _wrap_ListItem_SetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetState", (PyCFunction) _wrap_ListItem_SetState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetStateMask", (PyCFunction) _wrap_ListItem_SetStateMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetText", (PyCFunction) _wrap_ListItem_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetImage", (PyCFunction) _wrap_ListItem_SetImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetData", (PyCFunction) _wrap_ListItem_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetWidth", (PyCFunction) _wrap_ListItem_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetAlign", (PyCFunction) _wrap_ListItem_SetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetTextColour", (PyCFunction) _wrap_ListItem_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetBackgroundColour", (PyCFunction) _wrap_ListItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_SetFont", (PyCFunction) _wrap_ListItem_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetMask", (PyCFunction) _wrap_ListItem_GetMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetId", (PyCFunction) _wrap_ListItem_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetColumn", (PyCFunction) _wrap_ListItem_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetState", (PyCFunction) _wrap_ListItem_GetState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetText", (PyCFunction) _wrap_ListItem_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetImage", (PyCFunction) _wrap_ListItem_GetImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetData", (PyCFunction) _wrap_ListItem_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetWidth", (PyCFunction) _wrap_ListItem_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetAlign", (PyCFunction) _wrap_ListItem_GetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetAttributes", (PyCFunction) _wrap_ListItem_GetAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_HasAttributes", (PyCFunction) _wrap_ListItem_HasAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetTextColour", (PyCFunction) _wrap_ListItem_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetBackgroundColour", (PyCFunction) _wrap_ListItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_GetFont", (PyCFunction) _wrap_ListItem_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_mask_set", (PyCFunction) _wrap_ListItem_m_mask_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_mask_get", (PyCFunction) _wrap_ListItem_m_mask_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_itemId_set", (PyCFunction) _wrap_ListItem_m_itemId_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_itemId_get", (PyCFunction) _wrap_ListItem_m_itemId_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_col_set", (PyCFunction) _wrap_ListItem_m_col_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_col_get", (PyCFunction) _wrap_ListItem_m_col_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_state_set", (PyCFunction) _wrap_ListItem_m_state_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_state_get", (PyCFunction) _wrap_ListItem_m_state_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_stateMask_set", (PyCFunction) _wrap_ListItem_m_stateMask_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_stateMask_get", (PyCFunction) _wrap_ListItem_m_stateMask_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_text_set", (PyCFunction) _wrap_ListItem_m_text_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_text_get", (PyCFunction) _wrap_ListItem_m_text_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_image_set", (PyCFunction) _wrap_ListItem_m_image_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_image_get", (PyCFunction) _wrap_ListItem_m_image_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_data_set", (PyCFunction) _wrap_ListItem_m_data_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_data_get", (PyCFunction) _wrap_ListItem_m_data_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_format_set", (PyCFunction) _wrap_ListItem_m_format_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_format_get", (PyCFunction) _wrap_ListItem_m_format_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_width_set", (PyCFunction) _wrap_ListItem_m_width_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_m_width_get", (PyCFunction) _wrap_ListItem_m_width_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListItem_swigregister", ListItem_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListEvent", (PyCFunction) _wrap_new_ListEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_code_set", (PyCFunction) _wrap_ListEvent_m_code_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_code_get", (PyCFunction) _wrap_ListEvent_m_code_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_oldItemIndex_set", (PyCFunction) _wrap_ListEvent_m_oldItemIndex_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_oldItemIndex_get", (PyCFunction) _wrap_ListEvent_m_oldItemIndex_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_itemIndex_set", (PyCFunction) _wrap_ListEvent_m_itemIndex_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_itemIndex_get", (PyCFunction) _wrap_ListEvent_m_itemIndex_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_col_set", (PyCFunction) _wrap_ListEvent_m_col_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_col_get", (PyCFunction) _wrap_ListEvent_m_col_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_pointDrag_set", (PyCFunction) _wrap_ListEvent_m_pointDrag_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_pointDrag_get", (PyCFunction) _wrap_ListEvent_m_pointDrag_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_m_item_get", (PyCFunction) _wrap_ListEvent_m_item_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetKeyCode", (PyCFunction) _wrap_ListEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetIndex", (PyCFunction) _wrap_ListEvent_GetIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetColumn", (PyCFunction) _wrap_ListEvent_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetPoint", (PyCFunction) _wrap_ListEvent_GetPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetLabel", (PyCFunction) _wrap_ListEvent_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetText", (PyCFunction) _wrap_ListEvent_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetImage", (PyCFunction) _wrap_ListEvent_GetImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetData", (PyCFunction) _wrap_ListEvent_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetMask", (PyCFunction) _wrap_ListEvent_GetMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetItem", (PyCFunction) _wrap_ListEvent_GetItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetCacheFrom", (PyCFunction) _wrap_ListEvent_GetCacheFrom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_GetCacheTo", (PyCFunction) _wrap_ListEvent_GetCacheTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_IsEditCancelled", (PyCFunction) _wrap_ListEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_SetEditCanceled", (PyCFunction) _wrap_ListEvent_SetEditCanceled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListEvent_swigregister", ListEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListCtrl", (PyCFunction) _wrap_new_ListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreListCtrl", (PyCFunction) _wrap_new_PreListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_Create", (PyCFunction) _wrap_ListCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl__setCallbackInfo", (PyCFunction) _wrap_ListCtrl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetForegroundColour", (PyCFunction) _wrap_ListCtrl_SetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetBackgroundColour", (PyCFunction) _wrap_ListCtrl_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetColumn", (PyCFunction) _wrap_ListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetColumn", (PyCFunction) _wrap_ListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetColumnWidth", (PyCFunction) _wrap_ListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetColumnWidth", (PyCFunction) _wrap_ListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetCountPerPage", (PyCFunction) _wrap_ListCtrl_GetCountPerPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetViewRect", (PyCFunction) _wrap_ListCtrl_GetViewRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItem", (PyCFunction) _wrap_ListCtrl_GetItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItem", (PyCFunction) _wrap_ListCtrl_SetItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetStringItem", (PyCFunction) _wrap_ListCtrl_SetStringItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemState", (PyCFunction) _wrap_ListCtrl_GetItemState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemState", (PyCFunction) _wrap_ListCtrl_SetItemState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemImage", (PyCFunction) _wrap_ListCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemText", (PyCFunction) _wrap_ListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemText", (PyCFunction) _wrap_ListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemData", (PyCFunction) _wrap_ListCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemData", (PyCFunction) _wrap_ListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemPosition", (PyCFunction) _wrap_ListCtrl_GetItemPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemRect", (PyCFunction) _wrap_ListCtrl_GetItemRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemPosition", (PyCFunction) _wrap_ListCtrl_SetItemPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemCount", (PyCFunction) _wrap_ListCtrl_GetItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetColumnCount", (PyCFunction) _wrap_ListCtrl_GetColumnCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemSpacing", (PyCFunction) _wrap_ListCtrl_GetItemSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemSpacing", (PyCFunction) _wrap_ListCtrl_SetItemSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetSelectedItemCount", (PyCFunction) _wrap_ListCtrl_GetSelectedItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetTextColour", (PyCFunction) _wrap_ListCtrl_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetTextColour", (PyCFunction) _wrap_ListCtrl_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetTopItem", (PyCFunction) _wrap_ListCtrl_GetTopItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetSingleStyle", (PyCFunction) _wrap_ListCtrl_SetSingleStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetWindowStyleFlag", (PyCFunction) _wrap_ListCtrl_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetNextItem", (PyCFunction) _wrap_ListCtrl_GetNextItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetImageList", (PyCFunction) _wrap_ListCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetImageList", (PyCFunction) _wrap_ListCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_AssignImageList", (PyCFunction) _wrap_ListCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InReportView", (PyCFunction) _wrap_ListCtrl_InReportView, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_IsVirtual", (PyCFunction) _wrap_ListCtrl_IsVirtual, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_RefreshItem", (PyCFunction) _wrap_ListCtrl_RefreshItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_RefreshItems", (PyCFunction) _wrap_ListCtrl_RefreshItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_Arrange", (PyCFunction) _wrap_ListCtrl_Arrange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_DeleteItem", (PyCFunction) _wrap_ListCtrl_DeleteItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_DeleteAllItems", (PyCFunction) _wrap_ListCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_DeleteColumn", (PyCFunction) _wrap_ListCtrl_DeleteColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_DeleteAllColumns", (PyCFunction) _wrap_ListCtrl_DeleteAllColumns, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_ClearAll", (PyCFunction) _wrap_ListCtrl_ClearAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_EditLabel", (PyCFunction) _wrap_ListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_EnsureVisible", (PyCFunction) _wrap_ListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_FindItem", (PyCFunction) _wrap_ListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_FindItemData", (PyCFunction) _wrap_ListCtrl_FindItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_FindItemAtPos", (PyCFunction) _wrap_ListCtrl_FindItemAtPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_HitTest", (PyCFunction) _wrap_ListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InsertItem", (PyCFunction) _wrap_ListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InsertStringItem", (PyCFunction) _wrap_ListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InsertImageItem", (PyCFunction) _wrap_ListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InsertImageStringItem", (PyCFunction) _wrap_ListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InsertColumnInfo", (PyCFunction) _wrap_ListCtrl_InsertColumnInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_InsertColumn", (PyCFunction) _wrap_ListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemCount", (PyCFunction) _wrap_ListCtrl_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_ScrollList", (PyCFunction) _wrap_ListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemTextColour", (PyCFunction) _wrap_ListCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemTextColour", (PyCFunction) _wrap_ListCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_ListCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_ListCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_SortItems", (PyCFunction) _wrap_ListCtrl_SortItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetMainWindow", (PyCFunction) _wrap_ListCtrl_GetMainWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_ListCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListCtrl_swigregister", ListCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ListView", (PyCFunction) _wrap_new_ListView, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreListView", (PyCFunction) _wrap_new_PreListView, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_Create", (PyCFunction) _wrap_ListView_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_Select", (PyCFunction) _wrap_ListView_Select, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_Focus", (PyCFunction) _wrap_ListView_Focus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_GetFocusedItem", (PyCFunction) _wrap_ListView_GetFocusedItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_GetNextSelected", (PyCFunction) _wrap_ListView_GetNextSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_GetFirstSelected", (PyCFunction) _wrap_ListView_GetFirstSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_IsSelected", (PyCFunction) _wrap_ListView_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_SetColumnImage", (PyCFunction) _wrap_ListView_SetColumnImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_ClearColumnImage", (PyCFunction) _wrap_ListView_ClearColumnImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ListView_swigregister", ListView_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeItemId", (PyCFunction) _wrap_new_TreeItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_TreeItemId", (PyCFunction) _wrap_delete_TreeItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemId_IsOk", (PyCFunction) _wrap_TreeItemId_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemId___eq__", (PyCFunction) _wrap_TreeItemId___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemId___ne__", (PyCFunction) _wrap_TreeItemId___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemId_m_pItem_set", (PyCFunction) _wrap_TreeItemId_m_pItem_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemId_m_pItem_get", (PyCFunction) _wrap_TreeItemId_m_pItem_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemId_swigregister", TreeItemId_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeItemData", (PyCFunction) _wrap_new_TreeItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemData_GetData", (PyCFunction) _wrap_TreeItemData_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemData_SetData", (PyCFunction) _wrap_TreeItemData_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemData_GetId", (PyCFunction) _wrap_TreeItemData_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemData_SetId", (PyCFunction) _wrap_TreeItemData_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemData_Destroy", (PyCFunction) _wrap_TreeItemData_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeItemData_swigregister", TreeItemData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeEvent", (PyCFunction) _wrap_new_TreeEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_GetItem", (PyCFunction) _wrap_TreeEvent_GetItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetItem", (PyCFunction) _wrap_TreeEvent_SetItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_GetOldItem", (PyCFunction) _wrap_TreeEvent_GetOldItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetOldItem", (PyCFunction) _wrap_TreeEvent_SetOldItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_GetPoint", (PyCFunction) _wrap_TreeEvent_GetPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetPoint", (PyCFunction) _wrap_TreeEvent_SetPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_GetKeyEvent", (PyCFunction) _wrap_TreeEvent_GetKeyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_GetKeyCode", (PyCFunction) _wrap_TreeEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetKeyEvent", (PyCFunction) _wrap_TreeEvent_SetKeyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_GetLabel", (PyCFunction) _wrap_TreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetLabel", (PyCFunction) _wrap_TreeEvent_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_IsEditCancelled", (PyCFunction) _wrap_TreeEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetEditCanceled", (PyCFunction) _wrap_TreeEvent_SetEditCanceled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_SetToolTip", (PyCFunction) _wrap_TreeEvent_SetToolTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeEvent_swigregister", TreeEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TreeCtrl", (PyCFunction) _wrap_new_TreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreTreeCtrl", (PyCFunction) _wrap_new_PreTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_Create", (PyCFunction) _wrap_TreeCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl__setCallbackInfo", (PyCFunction) _wrap_TreeCtrl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetCount", (PyCFunction) _wrap_TreeCtrl_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetIndent", (PyCFunction) _wrap_TreeCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetIndent", (PyCFunction) _wrap_TreeCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetSpacing", (PyCFunction) _wrap_TreeCtrl_GetSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetSpacing", (PyCFunction) _wrap_TreeCtrl_SetSpacing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetImageList", (PyCFunction) _wrap_TreeCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetStateImageList", (PyCFunction) _wrap_TreeCtrl_GetStateImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetImageList", (PyCFunction) _wrap_TreeCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetStateImageList", (PyCFunction) _wrap_TreeCtrl_SetStateImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_AssignImageList", (PyCFunction) _wrap_TreeCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_AssignStateImageList", (PyCFunction) _wrap_TreeCtrl_AssignStateImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemText", (PyCFunction) _wrap_TreeCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemImage", (PyCFunction) _wrap_TreeCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemData", (PyCFunction) _wrap_TreeCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemPyData", (PyCFunction) _wrap_TreeCtrl_GetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemTextColour", (PyCFunction) _wrap_TreeCtrl_GetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemBackgroundColour", (PyCFunction) _wrap_TreeCtrl_GetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemFont", (PyCFunction) _wrap_TreeCtrl_GetItemFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemText", (PyCFunction) _wrap_TreeCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemImage", (PyCFunction) _wrap_TreeCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemData", (PyCFunction) _wrap_TreeCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemPyData", (PyCFunction) _wrap_TreeCtrl_SetItemPyData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemHasChildren", (PyCFunction) _wrap_TreeCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemBold", (PyCFunction) _wrap_TreeCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemTextColour", (PyCFunction) _wrap_TreeCtrl_SetItemTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemBackgroundColour", (PyCFunction) _wrap_TreeCtrl_SetItemBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SetItemFont", (PyCFunction) _wrap_TreeCtrl_SetItemFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_IsVisible", (PyCFunction) _wrap_TreeCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_ItemHasChildren", (PyCFunction) _wrap_TreeCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_IsExpanded", (PyCFunction) _wrap_TreeCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_IsSelected", (PyCFunction) _wrap_TreeCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_IsBold", (PyCFunction) _wrap_TreeCtrl_IsBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetChildrenCount", (PyCFunction) _wrap_TreeCtrl_GetChildrenCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetRootItem", (PyCFunction) _wrap_TreeCtrl_GetRootItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetSelection", (PyCFunction) _wrap_TreeCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetSelections", (PyCFunction) _wrap_TreeCtrl_GetSelections, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetItemParent", (PyCFunction) _wrap_TreeCtrl_GetItemParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetFirstChild", (PyCFunction) _wrap_TreeCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetNextChild", (PyCFunction) _wrap_TreeCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetLastChild", (PyCFunction) _wrap_TreeCtrl_GetLastChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetNextSibling", (PyCFunction) _wrap_TreeCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetPrevSibling", (PyCFunction) _wrap_TreeCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_TreeCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetNextVisible", (PyCFunction) _wrap_TreeCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetPrevVisible", (PyCFunction) _wrap_TreeCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_AddRoot", (PyCFunction) _wrap_TreeCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_PrependItem", (PyCFunction) _wrap_TreeCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_InsertItem", (PyCFunction) _wrap_TreeCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_InsertItemBefore", (PyCFunction) _wrap_TreeCtrl_InsertItemBefore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_AppendItem", (PyCFunction) _wrap_TreeCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_Delete", (PyCFunction) _wrap_TreeCtrl_Delete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_DeleteChildren", (PyCFunction) _wrap_TreeCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_DeleteAllItems", (PyCFunction) _wrap_TreeCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_Expand", (PyCFunction) _wrap_TreeCtrl_Expand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_Collapse", (PyCFunction) _wrap_TreeCtrl_Collapse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_Toggle", (PyCFunction) _wrap_TreeCtrl_Toggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_Unselect", (PyCFunction) _wrap_TreeCtrl_Unselect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_UnselectItem", (PyCFunction) _wrap_TreeCtrl_UnselectItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_UnselectAll", (PyCFunction) _wrap_TreeCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SelectItem", (PyCFunction) _wrap_TreeCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_ToggleItemSelection", (PyCFunction) _wrap_TreeCtrl_ToggleItemSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_EnsureVisible", (PyCFunction) _wrap_TreeCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_ScrollTo", (PyCFunction) _wrap_TreeCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_EditLabel", (PyCFunction) _wrap_TreeCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetEditControl", (PyCFunction) _wrap_TreeCtrl_GetEditControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_SortChildren", (PyCFunction) _wrap_TreeCtrl_SortChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_HitTest", (PyCFunction) _wrap_TreeCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetBoundingRect", (PyCFunction) _wrap_TreeCtrl_GetBoundingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_TreeCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TreeCtrl_swigregister", TreeCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GenericDirCtrl", (PyCFunction) _wrap_new_GenericDirCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreGenericDirCtrl", (PyCFunction) _wrap_new_PreGenericDirCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_Create", (PyCFunction) _wrap_GenericDirCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_ExpandPath", (PyCFunction) _wrap_GenericDirCtrl_ExpandPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetDefaultPath", (PyCFunction) _wrap_GenericDirCtrl_GetDefaultPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_SetDefaultPath", (PyCFunction) _wrap_GenericDirCtrl_SetDefaultPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetPath", (PyCFunction) _wrap_GenericDirCtrl_GetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetFilePath", (PyCFunction) _wrap_GenericDirCtrl_GetFilePath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_SetPath", (PyCFunction) _wrap_GenericDirCtrl_SetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_ShowHidden", (PyCFunction) _wrap_GenericDirCtrl_ShowHidden, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetShowHidden", (PyCFunction) _wrap_GenericDirCtrl_GetShowHidden, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetFilter", (PyCFunction) _wrap_GenericDirCtrl_GetFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_SetFilter", (PyCFunction) _wrap_GenericDirCtrl_SetFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetFilterIndex", (PyCFunction) _wrap_GenericDirCtrl_GetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_SetFilterIndex", (PyCFunction) _wrap_GenericDirCtrl_SetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetRootId", (PyCFunction) _wrap_GenericDirCtrl_GetRootId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetTreeCtrl", (PyCFunction) _wrap_GenericDirCtrl_GetTreeCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_GetFilterListCtrl", (PyCFunction) _wrap_GenericDirCtrl_GetFilterListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_FindChild", (PyCFunction) _wrap_GenericDirCtrl_FindChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_DoResize", (PyCFunction) _wrap_GenericDirCtrl_DoResize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_ReCreateTree", (PyCFunction) _wrap_GenericDirCtrl_ReCreateTree, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericDirCtrl_swigregister", GenericDirCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DirFilterListCtrl", (PyCFunction) _wrap_new_DirFilterListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreDirFilterListCtrl", (PyCFunction) _wrap_new_PreDirFilterListCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirFilterListCtrl_Create", (PyCFunction) _wrap_DirFilterListCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirFilterListCtrl_FillFilterList", (PyCFunction) _wrap_DirFilterListCtrl_FillFilterList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirFilterListCtrl_swigregister", DirFilterListCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyControl", (PyCFunction) _wrap_new_PyControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePyControl", (PyCFunction) _wrap_new_PrePyControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl__setCallbackInfo", (PyCFunction) _wrap_PyControl__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_SetBestSize", (PyCFunction) _wrap_PyControl_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoMoveWindow", (PyCFunction) _wrap_PyControl_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoSetSize", (PyCFunction) _wrap_PyControl_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoSetClientSize", (PyCFunction) _wrap_PyControl_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoSetVirtualSize", (PyCFunction) _wrap_PyControl_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoGetSize", (PyCFunction) _wrap_PyControl_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoGetClientSize", (PyCFunction) _wrap_PyControl_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoGetPosition", (PyCFunction) _wrap_PyControl_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoGetVirtualSize", (PyCFunction) _wrap_PyControl_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_DoGetBestSize", (PyCFunction) _wrap_PyControl_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_InitDialog", (PyCFunction) _wrap_PyControl_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_TransferDataToWindow", (PyCFunction) _wrap_PyControl_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_TransferDataFromWindow", (PyCFunction) _wrap_PyControl_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_Validate", (PyCFunction) _wrap_PyControl_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_AcceptsFocus", (PyCFunction) _wrap_PyControl_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyControl_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_GetMaxSize", (PyCFunction) _wrap_PyControl_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_AddChild", (PyCFunction) _wrap_PyControl_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_RemoveChild", (PyCFunction) _wrap_PyControl_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_ShouldInheritColours", (PyCFunction) _wrap_PyControl_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyControl_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_base_GetDefaultAttributes", (PyCFunction) _wrap_PyControl_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyControl_swigregister", PyControl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HelpEvent", (PyCFunction) _wrap_new_HelpEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_GetPosition", (PyCFunction) _wrap_HelpEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_SetPosition", (PyCFunction) _wrap_HelpEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_GetLink", (PyCFunction) _wrap_HelpEvent_GetLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_SetLink", (PyCFunction) _wrap_HelpEvent_SetLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_GetTarget", (PyCFunction) _wrap_HelpEvent_GetTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_SetTarget", (PyCFunction) _wrap_HelpEvent_SetTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpEvent_swigregister", HelpEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ContextHelp", (PyCFunction) _wrap_new_ContextHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ContextHelp", (PyCFunction) _wrap_delete_ContextHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextHelp_BeginContextHelp", (PyCFunction) _wrap_ContextHelp_BeginContextHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextHelp_EndContextHelp", (PyCFunction) _wrap_ContextHelp_EndContextHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextHelp_swigregister", ContextHelp_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ContextHelpButton", (PyCFunction) _wrap_new_ContextHelpButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextHelpButton_swigregister", ContextHelpButton_swigregister, METH_VARARGS, NULL },
+        { (char *)"HelpProvider_Set", (PyCFunction) _wrap_HelpProvider_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_Get", (PyCFunction) _wrap_HelpProvider_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_GetHelp", (PyCFunction) _wrap_HelpProvider_GetHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_ShowHelp", (PyCFunction) _wrap_HelpProvider_ShowHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_AddHelp", (PyCFunction) _wrap_HelpProvider_AddHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_AddHelpById", (PyCFunction) _wrap_HelpProvider_AddHelpById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_RemoveHelp", (PyCFunction) _wrap_HelpProvider_RemoveHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_Destroy", (PyCFunction) _wrap_HelpProvider_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HelpProvider_swigregister", HelpProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SimpleHelpProvider", (PyCFunction) _wrap_new_SimpleHelpProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SimpleHelpProvider_swigregister", SimpleHelpProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DragImage", (PyCFunction) _wrap_new_DragImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DragIcon", (PyCFunction) _wrap_new_DragIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DragString", (PyCFunction) _wrap_new_DragString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DragTreeItem", (PyCFunction) _wrap_new_DragTreeItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DragListItem", (PyCFunction) _wrap_new_DragListItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_DragImage", (PyCFunction) _wrap_delete_DragImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_SetBackingBitmap", (PyCFunction) _wrap_DragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_BeginDrag", (PyCFunction) _wrap_DragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_BeginDragBounded", (PyCFunction) _wrap_DragImage_BeginDragBounded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_EndDrag", (PyCFunction) _wrap_DragImage_EndDrag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_Move", (PyCFunction) _wrap_DragImage_Move, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_Show", (PyCFunction) _wrap_DragImage_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_Hide", (PyCFunction) _wrap_DragImage_Hide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_GetImageRect", (PyCFunction) _wrap_DragImage_GetImageRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_DoDrawImage", (PyCFunction) _wrap_DragImage_DoDrawImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_UpdateBackingFromWindow", (PyCFunction) _wrap_DragImage_UpdateBackingFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_RedrawImage", (PyCFunction) _wrap_DragImage_RedrawImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DragImage_swigregister", DragImage_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -33188,7 +33306,7 @@ _swigt__p_wxValidator,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -33216,72 +33334,72 @@ SWIGEXPORT(void) SWIG_init(void) {
     
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"ButtonNameStr",_wrap_ButtonNameStr_get, _wrap_ButtonNameStr_set);
-    PyDict_SetItemString(d,"BU_LEFT", SWIG_FromInt((int)wxBU_LEFT));
-    PyDict_SetItemString(d,"BU_TOP", SWIG_FromInt((int)wxBU_TOP));
-    PyDict_SetItemString(d,"BU_RIGHT", SWIG_FromInt((int)wxBU_RIGHT));
-    PyDict_SetItemString(d,"BU_BOTTOM", SWIG_FromInt((int)wxBU_BOTTOM));
-    PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_FromInt((int)wxBU_EXACTFIT));
-    PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_FromInt((int)wxBU_AUTODRAW));
+    PyDict_SetItemString(d,"BU_LEFT", SWIG_From_int((int)wxBU_LEFT));
+    PyDict_SetItemString(d,"BU_TOP", SWIG_From_int((int)wxBU_TOP));
+    PyDict_SetItemString(d,"BU_RIGHT", SWIG_From_int((int)wxBU_RIGHT));
+    PyDict_SetItemString(d,"BU_BOTTOM", SWIG_From_int((int)wxBU_BOTTOM));
+    PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_From_int((int)wxBU_EXACTFIT));
+    PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_From_int((int)wxBU_AUTODRAW));
     SWIG_addvarlink(SWIG_globals,(char*)"CheckBoxNameStr",_wrap_CheckBoxNameStr_get, _wrap_CheckBoxNameStr_set);
-    PyDict_SetItemString(d,"CHK_2STATE", SWIG_FromInt((int)wxCHK_2STATE));
-    PyDict_SetItemString(d,"CHK_3STATE", SWIG_FromInt((int)wxCHK_3STATE));
-    PyDict_SetItemString(d,"CHK_ALLOW_3RD_STATE_FOR_USER", SWIG_FromInt((int)wxCHK_ALLOW_3RD_STATE_FOR_USER));
-    PyDict_SetItemString(d,"CHK_UNCHECKED", SWIG_FromInt((int)wxCHK_UNCHECKED));
-    PyDict_SetItemString(d,"CHK_CHECKED", SWIG_FromInt((int)wxCHK_CHECKED));
-    PyDict_SetItemString(d,"CHK_UNDETERMINED", SWIG_FromInt((int)wxCHK_UNDETERMINED));
+    PyDict_SetItemString(d,"CHK_2STATE", SWIG_From_int((int)wxCHK_2STATE));
+    PyDict_SetItemString(d,"CHK_3STATE", SWIG_From_int((int)wxCHK_3STATE));
+    PyDict_SetItemString(d,"CHK_ALLOW_3RD_STATE_FOR_USER", SWIG_From_int((int)wxCHK_ALLOW_3RD_STATE_FOR_USER));
+    PyDict_SetItemString(d,"CHK_UNCHECKED", SWIG_From_int((int)wxCHK_UNCHECKED));
+    PyDict_SetItemString(d,"CHK_CHECKED", SWIG_From_int((int)wxCHK_CHECKED));
+    PyDict_SetItemString(d,"CHK_UNDETERMINED", SWIG_From_int((int)wxCHK_UNDETERMINED));
     SWIG_addvarlink(SWIG_globals,(char*)"ChoiceNameStr",_wrap_ChoiceNameStr_get, _wrap_ChoiceNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ComboBoxNameStr",_wrap_ComboBoxNameStr_get, _wrap_ComboBoxNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"GaugeNameStr",_wrap_GaugeNameStr_get, _wrap_GaugeNameStr_set);
-    PyDict_SetItemString(d,"GA_HORIZONTAL", SWIG_FromInt((int)wxGA_HORIZONTAL));
-    PyDict_SetItemString(d,"GA_VERTICAL", SWIG_FromInt((int)wxGA_VERTICAL));
-    PyDict_SetItemString(d,"GA_SMOOTH", SWIG_FromInt((int)wxGA_SMOOTH));
-    PyDict_SetItemString(d,"GA_PROGRESSBAR", SWIG_FromInt((int)wxGA_PROGRESSBAR));
+    PyDict_SetItemString(d,"GA_HORIZONTAL", SWIG_From_int((int)wxGA_HORIZONTAL));
+    PyDict_SetItemString(d,"GA_VERTICAL", SWIG_From_int((int)wxGA_VERTICAL));
+    PyDict_SetItemString(d,"GA_SMOOTH", SWIG_From_int((int)wxGA_SMOOTH));
+    PyDict_SetItemString(d,"GA_PROGRESSBAR", SWIG_From_int((int)wxGA_PROGRESSBAR));
     SWIG_addvarlink(SWIG_globals,(char*)"StaticBitmapNameStr",_wrap_StaticBitmapNameStr_get, _wrap_StaticBitmapNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"StaticBoxNameStr",_wrap_StaticBoxNameStr_get, _wrap_StaticBoxNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"StaticTextNameStr",_wrap_StaticTextNameStr_get, _wrap_StaticTextNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ListBoxNameStr",_wrap_ListBoxNameStr_get, _wrap_ListBoxNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TextCtrlNameStr",_wrap_TextCtrlNameStr_get, _wrap_TextCtrlNameStr_set);
-    PyDict_SetItemString(d,"TE_NO_VSCROLL", SWIG_FromInt((int)wxTE_NO_VSCROLL));
-    PyDict_SetItemString(d,"TE_AUTO_SCROLL", SWIG_FromInt((int)wxTE_AUTO_SCROLL));
-    PyDict_SetItemString(d,"TE_READONLY", SWIG_FromInt((int)wxTE_READONLY));
-    PyDict_SetItemString(d,"TE_MULTILINE", SWIG_FromInt((int)wxTE_MULTILINE));
-    PyDict_SetItemString(d,"TE_PROCESS_TAB", SWIG_FromInt((int)wxTE_PROCESS_TAB));
-    PyDict_SetItemString(d,"TE_LEFT", SWIG_FromInt((int)wxTE_LEFT));
-    PyDict_SetItemString(d,"TE_CENTER", SWIG_FromInt((int)wxTE_CENTER));
-    PyDict_SetItemString(d,"TE_RIGHT", SWIG_FromInt((int)wxTE_RIGHT));
-    PyDict_SetItemString(d,"TE_CENTRE", SWIG_FromInt((int)wxTE_CENTRE));
-    PyDict_SetItemString(d,"TE_RICH", SWIG_FromInt((int)wxTE_RICH));
-    PyDict_SetItemString(d,"TE_PROCESS_ENTER", SWIG_FromInt((int)wxTE_PROCESS_ENTER));
-    PyDict_SetItemString(d,"TE_PASSWORD", SWIG_FromInt((int)wxTE_PASSWORD));
-    PyDict_SetItemString(d,"TE_AUTO_URL", SWIG_FromInt((int)wxTE_AUTO_URL));
-    PyDict_SetItemString(d,"TE_NOHIDESEL", SWIG_FromInt((int)wxTE_NOHIDESEL));
-    PyDict_SetItemString(d,"TE_DONTWRAP", SWIG_FromInt((int)wxTE_DONTWRAP));
-    PyDict_SetItemString(d,"TE_LINEWRAP", SWIG_FromInt((int)wxTE_LINEWRAP));
-    PyDict_SetItemString(d,"TE_WORDWRAP", SWIG_FromInt((int)wxTE_WORDWRAP));
-    PyDict_SetItemString(d,"TE_RICH2", SWIG_FromInt((int)wxTE_RICH2));
-    PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_FromInt((int)wxTEXT_ALIGNMENT_DEFAULT));
-    PyDict_SetItemString(d,"TEXT_ALIGNMENT_LEFT", SWIG_FromInt((int)wxTEXT_ALIGNMENT_LEFT));
-    PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTRE", SWIG_FromInt((int)wxTEXT_ALIGNMENT_CENTRE));
-    PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTER", SWIG_FromInt((int)wxTEXT_ALIGNMENT_CENTER));
-    PyDict_SetItemString(d,"TEXT_ALIGNMENT_RIGHT", SWIG_FromInt((int)wxTEXT_ALIGNMENT_RIGHT));
-    PyDict_SetItemString(d,"TEXT_ALIGNMENT_JUSTIFIED", SWIG_FromInt((int)wxTEXT_ALIGNMENT_JUSTIFIED));
-    PyDict_SetItemString(d,"TEXT_ATTR_TEXT_COLOUR", SWIG_FromInt((int)wxTEXT_ATTR_TEXT_COLOUR));
-    PyDict_SetItemString(d,"TEXT_ATTR_BACKGROUND_COLOUR", SWIG_FromInt((int)wxTEXT_ATTR_BACKGROUND_COLOUR));
-    PyDict_SetItemString(d,"TEXT_ATTR_FONT_FACE", SWIG_FromInt((int)wxTEXT_ATTR_FONT_FACE));
-    PyDict_SetItemString(d,"TEXT_ATTR_FONT_SIZE", SWIG_FromInt((int)wxTEXT_ATTR_FONT_SIZE));
-    PyDict_SetItemString(d,"TEXT_ATTR_FONT_WEIGHT", SWIG_FromInt((int)wxTEXT_ATTR_FONT_WEIGHT));
-    PyDict_SetItemString(d,"TEXT_ATTR_FONT_ITALIC", SWIG_FromInt((int)wxTEXT_ATTR_FONT_ITALIC));
-    PyDict_SetItemString(d,"TEXT_ATTR_FONT_UNDERLINE", SWIG_FromInt((int)wxTEXT_ATTR_FONT_UNDERLINE));
-    PyDict_SetItemString(d,"TEXT_ATTR_FONT", SWIG_FromInt((int)wxTEXT_ATTR_FONT));
-    PyDict_SetItemString(d,"TEXT_ATTR_ALIGNMENT", SWIG_FromInt((int)wxTEXT_ATTR_ALIGNMENT));
-    PyDict_SetItemString(d,"TEXT_ATTR_LEFT_INDENT", SWIG_FromInt((int)wxTEXT_ATTR_LEFT_INDENT));
-    PyDict_SetItemString(d,"TEXT_ATTR_RIGHT_INDENT", SWIG_FromInt((int)wxTEXT_ATTR_RIGHT_INDENT));
-    PyDict_SetItemString(d,"TEXT_ATTR_TABS", SWIG_FromInt((int)wxTEXT_ATTR_TABS));
-    PyDict_SetItemString(d,"TE_HT_UNKNOWN", SWIG_FromInt((int)wxTE_HT_UNKNOWN));
-    PyDict_SetItemString(d,"TE_HT_BEFORE", SWIG_FromInt((int)wxTE_HT_BEFORE));
-    PyDict_SetItemString(d,"TE_HT_ON_TEXT", SWIG_FromInt((int)wxTE_HT_ON_TEXT));
-    PyDict_SetItemString(d,"TE_HT_BELOW", SWIG_FromInt((int)wxTE_HT_BELOW));
-    PyDict_SetItemString(d,"TE_HT_BEYOND", SWIG_FromInt((int)wxTE_HT_BEYOND));
+    PyDict_SetItemString(d,"TE_NO_VSCROLL", SWIG_From_int((int)wxTE_NO_VSCROLL));
+    PyDict_SetItemString(d,"TE_AUTO_SCROLL", SWIG_From_int((int)wxTE_AUTO_SCROLL));
+    PyDict_SetItemString(d,"TE_READONLY", SWIG_From_int((int)wxTE_READONLY));
+    PyDict_SetItemString(d,"TE_MULTILINE", SWIG_From_int((int)wxTE_MULTILINE));
+    PyDict_SetItemString(d,"TE_PROCESS_TAB", SWIG_From_int((int)wxTE_PROCESS_TAB));
+    PyDict_SetItemString(d,"TE_LEFT", SWIG_From_int((int)wxTE_LEFT));
+    PyDict_SetItemString(d,"TE_CENTER", SWIG_From_int((int)wxTE_CENTER));
+    PyDict_SetItemString(d,"TE_RIGHT", SWIG_From_int((int)wxTE_RIGHT));
+    PyDict_SetItemString(d,"TE_CENTRE", SWIG_From_int((int)wxTE_CENTRE));
+    PyDict_SetItemString(d,"TE_RICH", SWIG_From_int((int)wxTE_RICH));
+    PyDict_SetItemString(d,"TE_PROCESS_ENTER", SWIG_From_int((int)wxTE_PROCESS_ENTER));
+    PyDict_SetItemString(d,"TE_PASSWORD", SWIG_From_int((int)wxTE_PASSWORD));
+    PyDict_SetItemString(d,"TE_AUTO_URL", SWIG_From_int((int)wxTE_AUTO_URL));
+    PyDict_SetItemString(d,"TE_NOHIDESEL", SWIG_From_int((int)wxTE_NOHIDESEL));
+    PyDict_SetItemString(d,"TE_DONTWRAP", SWIG_From_int((int)wxTE_DONTWRAP));
+    PyDict_SetItemString(d,"TE_LINEWRAP", SWIG_From_int((int)wxTE_LINEWRAP));
+    PyDict_SetItemString(d,"TE_WORDWRAP", SWIG_From_int((int)wxTE_WORDWRAP));
+    PyDict_SetItemString(d,"TE_RICH2", SWIG_From_int((int)wxTE_RICH2));
+    PyDict_SetItemString(d,"TEXT_ALIGNMENT_DEFAULT", SWIG_From_int((int)wxTEXT_ALIGNMENT_DEFAULT));
+    PyDict_SetItemString(d,"TEXT_ALIGNMENT_LEFT", SWIG_From_int((int)wxTEXT_ALIGNMENT_LEFT));
+    PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTRE", SWIG_From_int((int)wxTEXT_ALIGNMENT_CENTRE));
+    PyDict_SetItemString(d,"TEXT_ALIGNMENT_CENTER", SWIG_From_int((int)wxTEXT_ALIGNMENT_CENTER));
+    PyDict_SetItemString(d,"TEXT_ALIGNMENT_RIGHT", SWIG_From_int((int)wxTEXT_ALIGNMENT_RIGHT));
+    PyDict_SetItemString(d,"TEXT_ALIGNMENT_JUSTIFIED", SWIG_From_int((int)wxTEXT_ALIGNMENT_JUSTIFIED));
+    PyDict_SetItemString(d,"TEXT_ATTR_TEXT_COLOUR", SWIG_From_int((int)wxTEXT_ATTR_TEXT_COLOUR));
+    PyDict_SetItemString(d,"TEXT_ATTR_BACKGROUND_COLOUR", SWIG_From_int((int)wxTEXT_ATTR_BACKGROUND_COLOUR));
+    PyDict_SetItemString(d,"TEXT_ATTR_FONT_FACE", SWIG_From_int((int)wxTEXT_ATTR_FONT_FACE));
+    PyDict_SetItemString(d,"TEXT_ATTR_FONT_SIZE", SWIG_From_int((int)wxTEXT_ATTR_FONT_SIZE));
+    PyDict_SetItemString(d,"TEXT_ATTR_FONT_WEIGHT", SWIG_From_int((int)wxTEXT_ATTR_FONT_WEIGHT));
+    PyDict_SetItemString(d,"TEXT_ATTR_FONT_ITALIC", SWIG_From_int((int)wxTEXT_ATTR_FONT_ITALIC));
+    PyDict_SetItemString(d,"TEXT_ATTR_FONT_UNDERLINE", SWIG_From_int((int)wxTEXT_ATTR_FONT_UNDERLINE));
+    PyDict_SetItemString(d,"TEXT_ATTR_FONT", SWIG_From_int((int)wxTEXT_ATTR_FONT));
+    PyDict_SetItemString(d,"TEXT_ATTR_ALIGNMENT", SWIG_From_int((int)wxTEXT_ATTR_ALIGNMENT));
+    PyDict_SetItemString(d,"TEXT_ATTR_LEFT_INDENT", SWIG_From_int((int)wxTEXT_ATTR_LEFT_INDENT));
+    PyDict_SetItemString(d,"TEXT_ATTR_RIGHT_INDENT", SWIG_From_int((int)wxTEXT_ATTR_RIGHT_INDENT));
+    PyDict_SetItemString(d,"TEXT_ATTR_TABS", SWIG_From_int((int)wxTEXT_ATTR_TABS));
+    PyDict_SetItemString(d,"TE_HT_UNKNOWN", SWIG_From_int((int)wxTE_HT_UNKNOWN));
+    PyDict_SetItemString(d,"TE_HT_BEFORE", SWIG_From_int((int)wxTE_HT_BEFORE));
+    PyDict_SetItemString(d,"TE_HT_ON_TEXT", SWIG_From_int((int)wxTE_HT_ON_TEXT));
+    PyDict_SetItemString(d,"TE_HT_BELOW", SWIG_From_int((int)wxTE_HT_BELOW));
+    PyDict_SetItemString(d,"TE_HT_BEYOND", SWIG_From_int((int)wxTE_HT_BEYOND));
     PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_UPDATED", PyInt_FromLong(wxEVT_COMMAND_TEXT_UPDATED));
     PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_ENTER", PyInt_FromLong(wxEVT_COMMAND_TEXT_ENTER));
     PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_URL", PyInt_FromLong(wxEVT_COMMAND_TEXT_URL));
@@ -33289,10 +33407,10 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"ScrollBarNameStr",_wrap_ScrollBarNameStr_get, _wrap_ScrollBarNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"SPIN_BUTTON_NAME",_wrap_SPIN_BUTTON_NAME_get, _wrap_SPIN_BUTTON_NAME_set);
     SWIG_addvarlink(SWIG_globals,(char*)"SpinCtrlNameStr",_wrap_SpinCtrlNameStr_get, _wrap_SpinCtrlNameStr_set);
-    PyDict_SetItemString(d,"SP_HORIZONTAL", SWIG_FromInt((int)wxSP_HORIZONTAL));
-    PyDict_SetItemString(d,"SP_VERTICAL", SWIG_FromInt((int)wxSP_VERTICAL));
-    PyDict_SetItemString(d,"SP_ARROW_KEYS", SWIG_FromInt((int)wxSP_ARROW_KEYS));
-    PyDict_SetItemString(d,"SP_WRAP", SWIG_FromInt((int)wxSP_WRAP));
+    PyDict_SetItemString(d,"SP_HORIZONTAL", SWIG_From_int((int)wxSP_HORIZONTAL));
+    PyDict_SetItemString(d,"SP_VERTICAL", SWIG_From_int((int)wxSP_VERTICAL));
+    PyDict_SetItemString(d,"SP_ARROW_KEYS", SWIG_From_int((int)wxSP_ARROW_KEYS));
+    PyDict_SetItemString(d,"SP_WRAP", SWIG_From_int((int)wxSP_WRAP));
     PyDict_SetItemString(d, "wxEVT_COMMAND_SPINCTRL_UPDATED", PyInt_FromLong(wxEVT_COMMAND_SPINCTRL_UPDATED));
     SWIG_addvarlink(SWIG_globals,(char*)"RadioBoxNameStr",_wrap_RadioBoxNameStr_get, _wrap_RadioBoxNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"RadioButtonNameStr",_wrap_RadioButtonNameStr_get, _wrap_RadioButtonNameStr_set);
@@ -33300,109 +33418,109 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set);
     PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED));
     SWIG_addvarlink(SWIG_globals,(char*)"NOTEBOOK_NAME",_wrap_NOTEBOOK_NAME_get, _wrap_NOTEBOOK_NAME_set);
-    PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_FromInt((int)wxNB_FIXEDWIDTH));
-    PyDict_SetItemString(d,"NB_TOP", SWIG_FromInt((int)wxNB_TOP));
-    PyDict_SetItemString(d,"NB_LEFT", SWIG_FromInt((int)wxNB_LEFT));
-    PyDict_SetItemString(d,"NB_RIGHT", SWIG_FromInt((int)wxNB_RIGHT));
-    PyDict_SetItemString(d,"NB_BOTTOM", SWIG_FromInt((int)wxNB_BOTTOM));
-    PyDict_SetItemString(d,"NB_MULTILINE", SWIG_FromInt((int)wxNB_MULTILINE));
-    PyDict_SetItemString(d,"NB_HITTEST_NOWHERE", SWIG_FromInt((int)wxNB_HITTEST_NOWHERE));
-    PyDict_SetItemString(d,"NB_HITTEST_ONICON", SWIG_FromInt((int)wxNB_HITTEST_ONICON));
-    PyDict_SetItemString(d,"NB_HITTEST_ONLABEL", SWIG_FromInt((int)wxNB_HITTEST_ONLABEL));
-    PyDict_SetItemString(d,"NB_HITTEST_ONITEM", SWIG_FromInt((int)wxNB_HITTEST_ONITEM));
+    PyDict_SetItemString(d,"NB_FIXEDWIDTH", SWIG_From_int((int)wxNB_FIXEDWIDTH));
+    PyDict_SetItemString(d,"NB_TOP", SWIG_From_int((int)wxNB_TOP));
+    PyDict_SetItemString(d,"NB_LEFT", SWIG_From_int((int)wxNB_LEFT));
+    PyDict_SetItemString(d,"NB_RIGHT", SWIG_From_int((int)wxNB_RIGHT));
+    PyDict_SetItemString(d,"NB_BOTTOM", SWIG_From_int((int)wxNB_BOTTOM));
+    PyDict_SetItemString(d,"NB_MULTILINE", SWIG_From_int((int)wxNB_MULTILINE));
+    PyDict_SetItemString(d,"NB_HITTEST_NOWHERE", SWIG_From_int((int)wxNB_HITTEST_NOWHERE));
+    PyDict_SetItemString(d,"NB_HITTEST_ONICON", SWIG_From_int((int)wxNB_HITTEST_ONICON));
+    PyDict_SetItemString(d,"NB_HITTEST_ONLABEL", SWIG_From_int((int)wxNB_HITTEST_ONLABEL));
+    PyDict_SetItemString(d,"NB_HITTEST_ONITEM", SWIG_From_int((int)wxNB_HITTEST_ONITEM));
     PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
     PyDict_SetItemString(d, "wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
-    PyDict_SetItemString(d,"LB_DEFAULT", SWIG_FromInt((int)wxLB_DEFAULT));
-    PyDict_SetItemString(d,"LB_TOP", SWIG_FromInt((int)wxLB_TOP));
-    PyDict_SetItemString(d,"LB_BOTTOM", SWIG_FromInt((int)wxLB_BOTTOM));
-    PyDict_SetItemString(d,"LB_LEFT", SWIG_FromInt((int)wxLB_LEFT));
-    PyDict_SetItemString(d,"LB_RIGHT", SWIG_FromInt((int)wxLB_RIGHT));
-    PyDict_SetItemString(d,"LB_ALIGN_MASK", SWIG_FromInt((int)wxLB_ALIGN_MASK));
+    PyDict_SetItemString(d,"LB_DEFAULT", SWIG_From_int((int)wxLB_DEFAULT));
+    PyDict_SetItemString(d,"LB_TOP", SWIG_From_int((int)wxLB_TOP));
+    PyDict_SetItemString(d,"LB_BOTTOM", SWIG_From_int((int)wxLB_BOTTOM));
+    PyDict_SetItemString(d,"LB_LEFT", SWIG_From_int((int)wxLB_LEFT));
+    PyDict_SetItemString(d,"LB_RIGHT", SWIG_From_int((int)wxLB_RIGHT));
+    PyDict_SetItemString(d,"LB_ALIGN_MASK", SWIG_From_int((int)wxLB_ALIGN_MASK));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED", PyInt_FromLong(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING", PyInt_FromLong(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING));
-    PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_FromInt((int)wxTOOL_STYLE_BUTTON));
-    PyDict_SetItemString(d,"TOOL_STYLE_SEPARATOR", SWIG_FromInt((int)wxTOOL_STYLE_SEPARATOR));
-    PyDict_SetItemString(d,"TOOL_STYLE_CONTROL", SWIG_FromInt((int)wxTOOL_STYLE_CONTROL));
-    PyDict_SetItemString(d,"TB_HORIZONTAL", SWIG_FromInt((int)wxTB_HORIZONTAL));
-    PyDict_SetItemString(d,"TB_VERTICAL", SWIG_FromInt((int)wxTB_VERTICAL));
-    PyDict_SetItemString(d,"TB_3DBUTTONS", SWIG_FromInt((int)wxTB_3DBUTTONS));
-    PyDict_SetItemString(d,"TB_FLAT", SWIG_FromInt((int)wxTB_FLAT));
-    PyDict_SetItemString(d,"TB_DOCKABLE", SWIG_FromInt((int)wxTB_DOCKABLE));
-    PyDict_SetItemString(d,"TB_NOICONS", SWIG_FromInt((int)wxTB_NOICONS));
-    PyDict_SetItemString(d,"TB_TEXT", SWIG_FromInt((int)wxTB_TEXT));
-    PyDict_SetItemString(d,"TB_NODIVIDER", SWIG_FromInt((int)wxTB_NODIVIDER));
-    PyDict_SetItemString(d,"TB_NOALIGN", SWIG_FromInt((int)wxTB_NOALIGN));
-    PyDict_SetItemString(d,"TB_HORZ_LAYOUT", SWIG_FromInt((int)wxTB_HORZ_LAYOUT));
-    PyDict_SetItemString(d,"TB_HORZ_TEXT", SWIG_FromInt((int)wxTB_HORZ_TEXT));
+    PyDict_SetItemString(d,"TOOL_STYLE_BUTTON", SWIG_From_int((int)wxTOOL_STYLE_BUTTON));
+    PyDict_SetItemString(d,"TOOL_STYLE_SEPARATOR", SWIG_From_int((int)wxTOOL_STYLE_SEPARATOR));
+    PyDict_SetItemString(d,"TOOL_STYLE_CONTROL", SWIG_From_int((int)wxTOOL_STYLE_CONTROL));
+    PyDict_SetItemString(d,"TB_HORIZONTAL", SWIG_From_int((int)wxTB_HORIZONTAL));
+    PyDict_SetItemString(d,"TB_VERTICAL", SWIG_From_int((int)wxTB_VERTICAL));
+    PyDict_SetItemString(d,"TB_3DBUTTONS", SWIG_From_int((int)wxTB_3DBUTTONS));
+    PyDict_SetItemString(d,"TB_FLAT", SWIG_From_int((int)wxTB_FLAT));
+    PyDict_SetItemString(d,"TB_DOCKABLE", SWIG_From_int((int)wxTB_DOCKABLE));
+    PyDict_SetItemString(d,"TB_NOICONS", SWIG_From_int((int)wxTB_NOICONS));
+    PyDict_SetItemString(d,"TB_TEXT", SWIG_From_int((int)wxTB_TEXT));
+    PyDict_SetItemString(d,"TB_NODIVIDER", SWIG_From_int((int)wxTB_NODIVIDER));
+    PyDict_SetItemString(d,"TB_NOALIGN", SWIG_From_int((int)wxTB_NOALIGN));
+    PyDict_SetItemString(d,"TB_HORZ_LAYOUT", SWIG_From_int((int)wxTB_HORZ_LAYOUT));
+    PyDict_SetItemString(d,"TB_HORZ_TEXT", SWIG_From_int((int)wxTB_HORZ_TEXT));
     SWIG_addvarlink(SWIG_globals,(char*)"ListCtrlNameStr",_wrap_ListCtrlNameStr_get, _wrap_ListCtrlNameStr_set);
-    PyDict_SetItemString(d,"LC_VRULES", SWIG_FromInt((int)wxLC_VRULES));
-    PyDict_SetItemString(d,"LC_HRULES", SWIG_FromInt((int)wxLC_HRULES));
-    PyDict_SetItemString(d,"LC_ICON", SWIG_FromInt((int)wxLC_ICON));
-    PyDict_SetItemString(d,"LC_SMALL_ICON", SWIG_FromInt((int)wxLC_SMALL_ICON));
-    PyDict_SetItemString(d,"LC_LIST", SWIG_FromInt((int)wxLC_LIST));
-    PyDict_SetItemString(d,"LC_REPORT", SWIG_FromInt((int)wxLC_REPORT));
-    PyDict_SetItemString(d,"LC_ALIGN_TOP", SWIG_FromInt((int)wxLC_ALIGN_TOP));
-    PyDict_SetItemString(d,"LC_ALIGN_LEFT", SWIG_FromInt((int)wxLC_ALIGN_LEFT));
-    PyDict_SetItemString(d,"LC_AUTOARRANGE", SWIG_FromInt((int)wxLC_AUTOARRANGE));
-    PyDict_SetItemString(d,"LC_VIRTUAL", SWIG_FromInt((int)wxLC_VIRTUAL));
-    PyDict_SetItemString(d,"LC_EDIT_LABELS", SWIG_FromInt((int)wxLC_EDIT_LABELS));
-    PyDict_SetItemString(d,"LC_NO_HEADER", SWIG_FromInt((int)wxLC_NO_HEADER));
-    PyDict_SetItemString(d,"LC_NO_SORT_HEADER", SWIG_FromInt((int)wxLC_NO_SORT_HEADER));
-    PyDict_SetItemString(d,"LC_SINGLE_SEL", SWIG_FromInt((int)wxLC_SINGLE_SEL));
-    PyDict_SetItemString(d,"LC_SORT_ASCENDING", SWIG_FromInt((int)wxLC_SORT_ASCENDING));
-    PyDict_SetItemString(d,"LC_SORT_DESCENDING", SWIG_FromInt((int)wxLC_SORT_DESCENDING));
-    PyDict_SetItemString(d,"LC_MASK_TYPE", SWIG_FromInt((int)wxLC_MASK_TYPE));
-    PyDict_SetItemString(d,"LC_MASK_ALIGN", SWIG_FromInt((int)wxLC_MASK_ALIGN));
-    PyDict_SetItemString(d,"LC_MASK_SORT", SWIG_FromInt((int)wxLC_MASK_SORT));
-    PyDict_SetItemString(d,"LIST_MASK_STATE", SWIG_FromInt((int)wxLIST_MASK_STATE));
-    PyDict_SetItemString(d,"LIST_MASK_TEXT", SWIG_FromInt((int)wxLIST_MASK_TEXT));
-    PyDict_SetItemString(d,"LIST_MASK_IMAGE", SWIG_FromInt((int)wxLIST_MASK_IMAGE));
-    PyDict_SetItemString(d,"LIST_MASK_DATA", SWIG_FromInt((int)wxLIST_MASK_DATA));
-    PyDict_SetItemString(d,"LIST_SET_ITEM", SWIG_FromInt((int)wxLIST_SET_ITEM));
-    PyDict_SetItemString(d,"LIST_MASK_WIDTH", SWIG_FromInt((int)wxLIST_MASK_WIDTH));
-    PyDict_SetItemString(d,"LIST_MASK_FORMAT", SWIG_FromInt((int)wxLIST_MASK_FORMAT));
-    PyDict_SetItemString(d,"LIST_STATE_DONTCARE", SWIG_FromInt((int)wxLIST_STATE_DONTCARE));
-    PyDict_SetItemString(d,"LIST_STATE_DROPHILITED", SWIG_FromInt((int)wxLIST_STATE_DROPHILITED));
-    PyDict_SetItemString(d,"LIST_STATE_FOCUSED", SWIG_FromInt((int)wxLIST_STATE_FOCUSED));
-    PyDict_SetItemString(d,"LIST_STATE_SELECTED", SWIG_FromInt((int)wxLIST_STATE_SELECTED));
-    PyDict_SetItemString(d,"LIST_STATE_CUT", SWIG_FromInt((int)wxLIST_STATE_CUT));
-    PyDict_SetItemString(d,"LIST_STATE_DISABLED", SWIG_FromInt((int)wxLIST_STATE_DISABLED));
-    PyDict_SetItemString(d,"LIST_STATE_FILTERED", SWIG_FromInt((int)wxLIST_STATE_FILTERED));
-    PyDict_SetItemString(d,"LIST_STATE_INUSE", SWIG_FromInt((int)wxLIST_STATE_INUSE));
-    PyDict_SetItemString(d,"LIST_STATE_PICKED", SWIG_FromInt((int)wxLIST_STATE_PICKED));
-    PyDict_SetItemString(d,"LIST_STATE_SOURCE", SWIG_FromInt((int)wxLIST_STATE_SOURCE));
-    PyDict_SetItemString(d,"LIST_HITTEST_ABOVE", SWIG_FromInt((int)wxLIST_HITTEST_ABOVE));
-    PyDict_SetItemString(d,"LIST_HITTEST_BELOW", SWIG_FromInt((int)wxLIST_HITTEST_BELOW));
-    PyDict_SetItemString(d,"LIST_HITTEST_NOWHERE", SWIG_FromInt((int)wxLIST_HITTEST_NOWHERE));
-    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMICON", SWIG_FromInt((int)wxLIST_HITTEST_ONITEMICON));
-    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMLABEL", SWIG_FromInt((int)wxLIST_HITTEST_ONITEMLABEL));
-    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMRIGHT", SWIG_FromInt((int)wxLIST_HITTEST_ONITEMRIGHT));
-    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMSTATEICON", SWIG_FromInt((int)wxLIST_HITTEST_ONITEMSTATEICON));
-    PyDict_SetItemString(d,"LIST_HITTEST_TOLEFT", SWIG_FromInt((int)wxLIST_HITTEST_TOLEFT));
-    PyDict_SetItemString(d,"LIST_HITTEST_TORIGHT", SWIG_FromInt((int)wxLIST_HITTEST_TORIGHT));
-    PyDict_SetItemString(d,"LIST_HITTEST_ONITEM", SWIG_FromInt((int)wxLIST_HITTEST_ONITEM));
-    PyDict_SetItemString(d,"LIST_NEXT_ABOVE", SWIG_FromInt((int)wxLIST_NEXT_ABOVE));
-    PyDict_SetItemString(d,"LIST_NEXT_ALL", SWIG_FromInt((int)wxLIST_NEXT_ALL));
-    PyDict_SetItemString(d,"LIST_NEXT_BELOW", SWIG_FromInt((int)wxLIST_NEXT_BELOW));
-    PyDict_SetItemString(d,"LIST_NEXT_LEFT", SWIG_FromInt((int)wxLIST_NEXT_LEFT));
-    PyDict_SetItemString(d,"LIST_NEXT_RIGHT", SWIG_FromInt((int)wxLIST_NEXT_RIGHT));
-    PyDict_SetItemString(d,"LIST_ALIGN_DEFAULT", SWIG_FromInt((int)wxLIST_ALIGN_DEFAULT));
-    PyDict_SetItemString(d,"LIST_ALIGN_LEFT", SWIG_FromInt((int)wxLIST_ALIGN_LEFT));
-    PyDict_SetItemString(d,"LIST_ALIGN_TOP", SWIG_FromInt((int)wxLIST_ALIGN_TOP));
-    PyDict_SetItemString(d,"LIST_ALIGN_SNAP_TO_GRID", SWIG_FromInt((int)wxLIST_ALIGN_SNAP_TO_GRID));
-    PyDict_SetItemString(d,"LIST_FORMAT_LEFT", SWIG_FromInt((int)wxLIST_FORMAT_LEFT));
-    PyDict_SetItemString(d,"LIST_FORMAT_RIGHT", SWIG_FromInt((int)wxLIST_FORMAT_RIGHT));
-    PyDict_SetItemString(d,"LIST_FORMAT_CENTRE", SWIG_FromInt((int)wxLIST_FORMAT_CENTRE));
-    PyDict_SetItemString(d,"LIST_FORMAT_CENTER", SWIG_FromInt((int)wxLIST_FORMAT_CENTER));
-    PyDict_SetItemString(d,"LIST_AUTOSIZE", SWIG_FromInt((int)wxLIST_AUTOSIZE));
-    PyDict_SetItemString(d,"LIST_AUTOSIZE_USEHEADER", SWIG_FromInt((int)wxLIST_AUTOSIZE_USEHEADER));
-    PyDict_SetItemString(d,"LIST_RECT_BOUNDS", SWIG_FromInt((int)wxLIST_RECT_BOUNDS));
-    PyDict_SetItemString(d,"LIST_RECT_ICON", SWIG_FromInt((int)wxLIST_RECT_ICON));
-    PyDict_SetItemString(d,"LIST_RECT_LABEL", SWIG_FromInt((int)wxLIST_RECT_LABEL));
-    PyDict_SetItemString(d,"LIST_FIND_UP", SWIG_FromInt((int)wxLIST_FIND_UP));
-    PyDict_SetItemString(d,"LIST_FIND_DOWN", SWIG_FromInt((int)wxLIST_FIND_DOWN));
-    PyDict_SetItemString(d,"LIST_FIND_LEFT", SWIG_FromInt((int)wxLIST_FIND_LEFT));
-    PyDict_SetItemString(d,"LIST_FIND_RIGHT", SWIG_FromInt((int)wxLIST_FIND_RIGHT));
+    PyDict_SetItemString(d,"LC_VRULES", SWIG_From_int((int)wxLC_VRULES));
+    PyDict_SetItemString(d,"LC_HRULES", SWIG_From_int((int)wxLC_HRULES));
+    PyDict_SetItemString(d,"LC_ICON", SWIG_From_int((int)wxLC_ICON));
+    PyDict_SetItemString(d,"LC_SMALL_ICON", SWIG_From_int((int)wxLC_SMALL_ICON));
+    PyDict_SetItemString(d,"LC_LIST", SWIG_From_int((int)wxLC_LIST));
+    PyDict_SetItemString(d,"LC_REPORT", SWIG_From_int((int)wxLC_REPORT));
+    PyDict_SetItemString(d,"LC_ALIGN_TOP", SWIG_From_int((int)wxLC_ALIGN_TOP));
+    PyDict_SetItemString(d,"LC_ALIGN_LEFT", SWIG_From_int((int)wxLC_ALIGN_LEFT));
+    PyDict_SetItemString(d,"LC_AUTOARRANGE", SWIG_From_int((int)wxLC_AUTOARRANGE));
+    PyDict_SetItemString(d,"LC_VIRTUAL", SWIG_From_int((int)wxLC_VIRTUAL));
+    PyDict_SetItemString(d,"LC_EDIT_LABELS", SWIG_From_int((int)wxLC_EDIT_LABELS));
+    PyDict_SetItemString(d,"LC_NO_HEADER", SWIG_From_int((int)wxLC_NO_HEADER));
+    PyDict_SetItemString(d,"LC_NO_SORT_HEADER", SWIG_From_int((int)wxLC_NO_SORT_HEADER));
+    PyDict_SetItemString(d,"LC_SINGLE_SEL", SWIG_From_int((int)wxLC_SINGLE_SEL));
+    PyDict_SetItemString(d,"LC_SORT_ASCENDING", SWIG_From_int((int)wxLC_SORT_ASCENDING));
+    PyDict_SetItemString(d,"LC_SORT_DESCENDING", SWIG_From_int((int)wxLC_SORT_DESCENDING));
+    PyDict_SetItemString(d,"LC_MASK_TYPE", SWIG_From_int((int)wxLC_MASK_TYPE));
+    PyDict_SetItemString(d,"LC_MASK_ALIGN", SWIG_From_int((int)wxLC_MASK_ALIGN));
+    PyDict_SetItemString(d,"LC_MASK_SORT", SWIG_From_int((int)wxLC_MASK_SORT));
+    PyDict_SetItemString(d,"LIST_MASK_STATE", SWIG_From_int((int)wxLIST_MASK_STATE));
+    PyDict_SetItemString(d,"LIST_MASK_TEXT", SWIG_From_int((int)wxLIST_MASK_TEXT));
+    PyDict_SetItemString(d,"LIST_MASK_IMAGE", SWIG_From_int((int)wxLIST_MASK_IMAGE));
+    PyDict_SetItemString(d,"LIST_MASK_DATA", SWIG_From_int((int)wxLIST_MASK_DATA));
+    PyDict_SetItemString(d,"LIST_SET_ITEM", SWIG_From_int((int)wxLIST_SET_ITEM));
+    PyDict_SetItemString(d,"LIST_MASK_WIDTH", SWIG_From_int((int)wxLIST_MASK_WIDTH));
+    PyDict_SetItemString(d,"LIST_MASK_FORMAT", SWIG_From_int((int)wxLIST_MASK_FORMAT));
+    PyDict_SetItemString(d,"LIST_STATE_DONTCARE", SWIG_From_int((int)wxLIST_STATE_DONTCARE));
+    PyDict_SetItemString(d,"LIST_STATE_DROPHILITED", SWIG_From_int((int)wxLIST_STATE_DROPHILITED));
+    PyDict_SetItemString(d,"LIST_STATE_FOCUSED", SWIG_From_int((int)wxLIST_STATE_FOCUSED));
+    PyDict_SetItemString(d,"LIST_STATE_SELECTED", SWIG_From_int((int)wxLIST_STATE_SELECTED));
+    PyDict_SetItemString(d,"LIST_STATE_CUT", SWIG_From_int((int)wxLIST_STATE_CUT));
+    PyDict_SetItemString(d,"LIST_STATE_DISABLED", SWIG_From_int((int)wxLIST_STATE_DISABLED));
+    PyDict_SetItemString(d,"LIST_STATE_FILTERED", SWIG_From_int((int)wxLIST_STATE_FILTERED));
+    PyDict_SetItemString(d,"LIST_STATE_INUSE", SWIG_From_int((int)wxLIST_STATE_INUSE));
+    PyDict_SetItemString(d,"LIST_STATE_PICKED", SWIG_From_int((int)wxLIST_STATE_PICKED));
+    PyDict_SetItemString(d,"LIST_STATE_SOURCE", SWIG_From_int((int)wxLIST_STATE_SOURCE));
+    PyDict_SetItemString(d,"LIST_HITTEST_ABOVE", SWIG_From_int((int)wxLIST_HITTEST_ABOVE));
+    PyDict_SetItemString(d,"LIST_HITTEST_BELOW", SWIG_From_int((int)wxLIST_HITTEST_BELOW));
+    PyDict_SetItemString(d,"LIST_HITTEST_NOWHERE", SWIG_From_int((int)wxLIST_HITTEST_NOWHERE));
+    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMICON", SWIG_From_int((int)wxLIST_HITTEST_ONITEMICON));
+    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMLABEL", SWIG_From_int((int)wxLIST_HITTEST_ONITEMLABEL));
+    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMRIGHT", SWIG_From_int((int)wxLIST_HITTEST_ONITEMRIGHT));
+    PyDict_SetItemString(d,"LIST_HITTEST_ONITEMSTATEICON", SWIG_From_int((int)wxLIST_HITTEST_ONITEMSTATEICON));
+    PyDict_SetItemString(d,"LIST_HITTEST_TOLEFT", SWIG_From_int((int)wxLIST_HITTEST_TOLEFT));
+    PyDict_SetItemString(d,"LIST_HITTEST_TORIGHT", SWIG_From_int((int)wxLIST_HITTEST_TORIGHT));
+    PyDict_SetItemString(d,"LIST_HITTEST_ONITEM", SWIG_From_int((int)wxLIST_HITTEST_ONITEM));
+    PyDict_SetItemString(d,"LIST_NEXT_ABOVE", SWIG_From_int((int)wxLIST_NEXT_ABOVE));
+    PyDict_SetItemString(d,"LIST_NEXT_ALL", SWIG_From_int((int)wxLIST_NEXT_ALL));
+    PyDict_SetItemString(d,"LIST_NEXT_BELOW", SWIG_From_int((int)wxLIST_NEXT_BELOW));
+    PyDict_SetItemString(d,"LIST_NEXT_LEFT", SWIG_From_int((int)wxLIST_NEXT_LEFT));
+    PyDict_SetItemString(d,"LIST_NEXT_RIGHT", SWIG_From_int((int)wxLIST_NEXT_RIGHT));
+    PyDict_SetItemString(d,"LIST_ALIGN_DEFAULT", SWIG_From_int((int)wxLIST_ALIGN_DEFAULT));
+    PyDict_SetItemString(d,"LIST_ALIGN_LEFT", SWIG_From_int((int)wxLIST_ALIGN_LEFT));
+    PyDict_SetItemString(d,"LIST_ALIGN_TOP", SWIG_From_int((int)wxLIST_ALIGN_TOP));
+    PyDict_SetItemString(d,"LIST_ALIGN_SNAP_TO_GRID", SWIG_From_int((int)wxLIST_ALIGN_SNAP_TO_GRID));
+    PyDict_SetItemString(d,"LIST_FORMAT_LEFT", SWIG_From_int((int)wxLIST_FORMAT_LEFT));
+    PyDict_SetItemString(d,"LIST_FORMAT_RIGHT", SWIG_From_int((int)wxLIST_FORMAT_RIGHT));
+    PyDict_SetItemString(d,"LIST_FORMAT_CENTRE", SWIG_From_int((int)wxLIST_FORMAT_CENTRE));
+    PyDict_SetItemString(d,"LIST_FORMAT_CENTER", SWIG_From_int((int)wxLIST_FORMAT_CENTER));
+    PyDict_SetItemString(d,"LIST_AUTOSIZE", SWIG_From_int((int)wxLIST_AUTOSIZE));
+    PyDict_SetItemString(d,"LIST_AUTOSIZE_USEHEADER", SWIG_From_int((int)wxLIST_AUTOSIZE_USEHEADER));
+    PyDict_SetItemString(d,"LIST_RECT_BOUNDS", SWIG_From_int((int)wxLIST_RECT_BOUNDS));
+    PyDict_SetItemString(d,"LIST_RECT_ICON", SWIG_From_int((int)wxLIST_RECT_ICON));
+    PyDict_SetItemString(d,"LIST_RECT_LABEL", SWIG_From_int((int)wxLIST_RECT_LABEL));
+    PyDict_SetItemString(d,"LIST_FIND_UP", SWIG_From_int((int)wxLIST_FIND_UP));
+    PyDict_SetItemString(d,"LIST_FIND_DOWN", SWIG_From_int((int)wxLIST_FIND_DOWN));
+    PyDict_SetItemString(d,"LIST_FIND_LEFT", SWIG_From_int((int)wxLIST_FIND_LEFT));
+    PyDict_SetItemString(d,"LIST_FIND_RIGHT", SWIG_From_int((int)wxLIST_FIND_RIGHT));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_DRAG));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_RDRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_RDRAG));
     PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT));
@@ -33430,41 +33548,41 @@ SWIGEXPORT(void) SWIG_init(void) {
     wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl");
     
     SWIG_addvarlink(SWIG_globals,(char*)"TreeCtrlNameStr",_wrap_TreeCtrlNameStr_get, _wrap_TreeCtrlNameStr_set);
-    PyDict_SetItemString(d,"TR_NO_BUTTONS", SWIG_FromInt((int)wxTR_NO_BUTTONS));
-    PyDict_SetItemString(d,"TR_HAS_BUTTONS", SWIG_FromInt((int)wxTR_HAS_BUTTONS));
-    PyDict_SetItemString(d,"TR_NO_LINES", SWIG_FromInt((int)wxTR_NO_LINES));
-    PyDict_SetItemString(d,"TR_LINES_AT_ROOT", SWIG_FromInt((int)wxTR_LINES_AT_ROOT));
-    PyDict_SetItemString(d,"TR_SINGLE", SWIG_FromInt((int)wxTR_SINGLE));
-    PyDict_SetItemString(d,"TR_MULTIPLE", SWIG_FromInt((int)wxTR_MULTIPLE));
-    PyDict_SetItemString(d,"TR_EXTENDED", SWIG_FromInt((int)wxTR_EXTENDED));
-    PyDict_SetItemString(d,"TR_HAS_VARIABLE_ROW_HEIGHT", SWIG_FromInt((int)wxTR_HAS_VARIABLE_ROW_HEIGHT));
-    PyDict_SetItemString(d,"TR_EDIT_LABELS", SWIG_FromInt((int)wxTR_EDIT_LABELS));
-    PyDict_SetItemString(d,"TR_HIDE_ROOT", SWIG_FromInt((int)wxTR_HIDE_ROOT));
-    PyDict_SetItemString(d,"TR_ROW_LINES", SWIG_FromInt((int)wxTR_ROW_LINES));
-    PyDict_SetItemString(d,"TR_FULL_ROW_HIGHLIGHT", SWIG_FromInt((int)wxTR_FULL_ROW_HIGHLIGHT));
-    PyDict_SetItemString(d,"TR_DEFAULT_STYLE", SWIG_FromInt((int)wxTR_DEFAULT_STYLE));
-    PyDict_SetItemString(d,"TR_TWIST_BUTTONS", SWIG_FromInt((int)wxTR_TWIST_BUTTONS));
-    PyDict_SetItemString(d,"TR_MAC_BUTTONS", SWIG_FromInt((int)wxTR_MAC_BUTTONS));
-    PyDict_SetItemString(d,"TR_AQUA_BUTTONS", SWIG_FromInt((int)wxTR_AQUA_BUTTONS));
-    PyDict_SetItemString(d,"TreeItemIcon_Normal", SWIG_FromInt((int)wxTreeItemIcon_Normal));
-    PyDict_SetItemString(d,"TreeItemIcon_Selected", SWIG_FromInt((int)wxTreeItemIcon_Selected));
-    PyDict_SetItemString(d,"TreeItemIcon_Expanded", SWIG_FromInt((int)wxTreeItemIcon_Expanded));
-    PyDict_SetItemString(d,"TreeItemIcon_SelectedExpanded", SWIG_FromInt((int)wxTreeItemIcon_SelectedExpanded));
-    PyDict_SetItemString(d,"TreeItemIcon_Max", SWIG_FromInt((int)wxTreeItemIcon_Max));
-    PyDict_SetItemString(d,"TREE_HITTEST_ABOVE", SWIG_FromInt((int)wxTREE_HITTEST_ABOVE));
-    PyDict_SetItemString(d,"TREE_HITTEST_BELOW", SWIG_FromInt((int)wxTREE_HITTEST_BELOW));
-    PyDict_SetItemString(d,"TREE_HITTEST_NOWHERE", SWIG_FromInt((int)wxTREE_HITTEST_NOWHERE));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMBUTTON", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMBUTTON));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMICON", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMICON));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMINDENT", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMINDENT));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLABEL", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMLABEL));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMRIGHT", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMRIGHT));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMSTATEICON", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMSTATEICON));
-    PyDict_SetItemString(d,"TREE_HITTEST_TOLEFT", SWIG_FromInt((int)wxTREE_HITTEST_TOLEFT));
-    PyDict_SetItemString(d,"TREE_HITTEST_TORIGHT", SWIG_FromInt((int)wxTREE_HITTEST_TORIGHT));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMUPPERPART", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMUPPERPART));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLOWERPART", SWIG_FromInt((int)wxTREE_HITTEST_ONITEMLOWERPART));
-    PyDict_SetItemString(d,"TREE_HITTEST_ONITEM", SWIG_FromInt((int)wxTREE_HITTEST_ONITEM));
+    PyDict_SetItemString(d,"TR_NO_BUTTONS", SWIG_From_int((int)wxTR_NO_BUTTONS));
+    PyDict_SetItemString(d,"TR_HAS_BUTTONS", SWIG_From_int((int)wxTR_HAS_BUTTONS));
+    PyDict_SetItemString(d,"TR_NO_LINES", SWIG_From_int((int)wxTR_NO_LINES));
+    PyDict_SetItemString(d,"TR_LINES_AT_ROOT", SWIG_From_int((int)wxTR_LINES_AT_ROOT));
+    PyDict_SetItemString(d,"TR_SINGLE", SWIG_From_int((int)wxTR_SINGLE));
+    PyDict_SetItemString(d,"TR_MULTIPLE", SWIG_From_int((int)wxTR_MULTIPLE));
+    PyDict_SetItemString(d,"TR_EXTENDED", SWIG_From_int((int)wxTR_EXTENDED));
+    PyDict_SetItemString(d,"TR_HAS_VARIABLE_ROW_HEIGHT", SWIG_From_int((int)wxTR_HAS_VARIABLE_ROW_HEIGHT));
+    PyDict_SetItemString(d,"TR_EDIT_LABELS", SWIG_From_int((int)wxTR_EDIT_LABELS));
+    PyDict_SetItemString(d,"TR_HIDE_ROOT", SWIG_From_int((int)wxTR_HIDE_ROOT));
+    PyDict_SetItemString(d,"TR_ROW_LINES", SWIG_From_int((int)wxTR_ROW_LINES));
+    PyDict_SetItemString(d,"TR_FULL_ROW_HIGHLIGHT", SWIG_From_int((int)wxTR_FULL_ROW_HIGHLIGHT));
+    PyDict_SetItemString(d,"TR_DEFAULT_STYLE", SWIG_From_int((int)wxTR_DEFAULT_STYLE));
+    PyDict_SetItemString(d,"TR_TWIST_BUTTONS", SWIG_From_int((int)wxTR_TWIST_BUTTONS));
+    PyDict_SetItemString(d,"TR_MAC_BUTTONS", SWIG_From_int((int)wxTR_MAC_BUTTONS));
+    PyDict_SetItemString(d,"TR_AQUA_BUTTONS", SWIG_From_int((int)wxTR_AQUA_BUTTONS));
+    PyDict_SetItemString(d,"TreeItemIcon_Normal", SWIG_From_int((int)wxTreeItemIcon_Normal));
+    PyDict_SetItemString(d,"TreeItemIcon_Selected", SWIG_From_int((int)wxTreeItemIcon_Selected));
+    PyDict_SetItemString(d,"TreeItemIcon_Expanded", SWIG_From_int((int)wxTreeItemIcon_Expanded));
+    PyDict_SetItemString(d,"TreeItemIcon_SelectedExpanded", SWIG_From_int((int)wxTreeItemIcon_SelectedExpanded));
+    PyDict_SetItemString(d,"TreeItemIcon_Max", SWIG_From_int((int)wxTreeItemIcon_Max));
+    PyDict_SetItemString(d,"TREE_HITTEST_ABOVE", SWIG_From_int((int)wxTREE_HITTEST_ABOVE));
+    PyDict_SetItemString(d,"TREE_HITTEST_BELOW", SWIG_From_int((int)wxTREE_HITTEST_BELOW));
+    PyDict_SetItemString(d,"TREE_HITTEST_NOWHERE", SWIG_From_int((int)wxTREE_HITTEST_NOWHERE));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMBUTTON", SWIG_From_int((int)wxTREE_HITTEST_ONITEMBUTTON));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMICON", SWIG_From_int((int)wxTREE_HITTEST_ONITEMICON));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMINDENT", SWIG_From_int((int)wxTREE_HITTEST_ONITEMINDENT));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLABEL", SWIG_From_int((int)wxTREE_HITTEST_ONITEMLABEL));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMRIGHT", SWIG_From_int((int)wxTREE_HITTEST_ONITEMRIGHT));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMSTATEICON", SWIG_From_int((int)wxTREE_HITTEST_ONITEMSTATEICON));
+    PyDict_SetItemString(d,"TREE_HITTEST_TOLEFT", SWIG_From_int((int)wxTREE_HITTEST_TOLEFT));
+    PyDict_SetItemString(d,"TREE_HITTEST_TORIGHT", SWIG_From_int((int)wxTREE_HITTEST_TORIGHT));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMUPPERPART", SWIG_From_int((int)wxTREE_HITTEST_ONITEMUPPERPART));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEMLOWERPART", SWIG_From_int((int)wxTREE_HITTEST_ONITEMLOWERPART));
+    PyDict_SetItemString(d,"TREE_HITTEST_ONITEM", SWIG_From_int((int)wxTREE_HITTEST_ONITEM));
     PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_DRAG", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_DRAG));
     PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_RDRAG", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_RDRAG));
     PyDict_SetItemString(d, "wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT));
@@ -33491,13 +33609,13 @@ SWIGEXPORT(void) SWIG_init(void) {
     wxPyPtrTypeMap_Add("wxTreeCtrl", "wxPyTreeCtrl");
     
     SWIG_addvarlink(SWIG_globals,(char*)"DirDialogDefaultFolderStr",_wrap_DirDialogDefaultFolderStr_get, _wrap_DirDialogDefaultFolderStr_set);
-    PyDict_SetItemString(d,"DIRCTRL_DIR_ONLY", SWIG_FromInt((int)wxDIRCTRL_DIR_ONLY));
-    PyDict_SetItemString(d,"DIRCTRL_SELECT_FIRST", SWIG_FromInt((int)wxDIRCTRL_SELECT_FIRST));
-    PyDict_SetItemString(d,"DIRCTRL_SHOW_FILTERS", SWIG_FromInt((int)wxDIRCTRL_SHOW_FILTERS));
-    PyDict_SetItemString(d,"DIRCTRL_3D_INTERNAL", SWIG_FromInt((int)wxDIRCTRL_3D_INTERNAL));
-    PyDict_SetItemString(d,"DIRCTRL_EDIT_LABELS", SWIG_FromInt((int)wxDIRCTRL_EDIT_LABELS));
-    PyDict_SetItemString(d,"FRAME_EX_CONTEXTHELP", SWIG_FromInt((int)wxFRAME_EX_CONTEXTHELP));
-    PyDict_SetItemString(d,"DIALOG_EX_CONTEXTHELP", SWIG_FromInt((int)wxDIALOG_EX_CONTEXTHELP));
+    PyDict_SetItemString(d,"DIRCTRL_DIR_ONLY", SWIG_From_int((int)wxDIRCTRL_DIR_ONLY));
+    PyDict_SetItemString(d,"DIRCTRL_SELECT_FIRST", SWIG_From_int((int)wxDIRCTRL_SELECT_FIRST));
+    PyDict_SetItemString(d,"DIRCTRL_SHOW_FILTERS", SWIG_From_int((int)wxDIRCTRL_SHOW_FILTERS));
+    PyDict_SetItemString(d,"DIRCTRL_3D_INTERNAL", SWIG_From_int((int)wxDIRCTRL_3D_INTERNAL));
+    PyDict_SetItemString(d,"DIRCTRL_EDIT_LABELS", SWIG_From_int((int)wxDIRCTRL_EDIT_LABELS));
+    PyDict_SetItemString(d,"FRAME_EX_CONTEXTHELP", SWIG_From_int((int)wxFRAME_EX_CONTEXTHELP));
+    PyDict_SetItemString(d,"DIALOG_EX_CONTEXTHELP", SWIG_From_int((int)wxDIALOG_EX_CONTEXTHELP));
     PyDict_SetItemString(d, "wxEVT_HELP", PyInt_FromLong(wxEVT_HELP));
     PyDict_SetItemString(d, "wxEVT_DETAILED_HELP", PyInt_FromLong(wxEVT_DETAILED_HELP));
     

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index 8d8d6511b7c5ea013dbcc0320c13067103585910..b8fef9f30574f9d461a22b9c954f179fab54b381 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxLayoutConstraints swig_types[0] 
@@ -334,47 +336,64 @@ static swig_type_info *swig_types[117];
 
 #define SWIG_name    "_core_"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython_int.h"
@@ -503,6 +522,7 @@ static wxPyCoreAPI API = {
     (p_SWIG_Python_TypeCast_t)SWIG_Python_TypeCast,
     (p_SWIG_Python_TypeDynamicCast_t)SWIG_Python_TypeDynamicCast,
     (p_SWIG_Python_TypeName_t)SWIG_Python_TypeName,
+    (p_SWIG_Python_TypePrettyName_t)SWIG_Python_TypePrettyName,
     (p_SWIG_Python_TypeQuery_t)SWIG_Python_TypeQuery,
     (p_SWIG_Python_TypeClientData_t)SWIG_Python_TypeClientData,
     (p_SWIG_Python_newvarlink_t)SWIG_Python_newvarlink,
@@ -609,68 +629,97 @@ void wxObject_Destroy(wxObject *self){
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 PyObject *wxSize_Get(wxSize *self){
@@ -682,31 +731,44 @@ PyObject *wxSize_Get(wxSize *self){
             return tup;
         }
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckDouble(PyObject* obj)
+SWIGSTATICINLINE(double)
+SWIG_As_double(PyObject* obj)
 {
-  SWIG_AsDouble(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(double));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
 }
 
 void wxRealPoint_Set(wxRealPoint *self,double x,double y){
@@ -722,16 +784,26 @@ PyObject *wxRealPoint_Get(wxRealPoint *self){
             return tup;
         }
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 void wxPoint_Set(wxPoint *self,long x,long y){
@@ -784,21 +856,20 @@ PyObject *wxRect_Get(wxRect *self){
     }
 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -810,6 +881,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
+
 void wxPoint2D_Set(wxPoint2D *self,double x,double y){
             self->m_x = x;
             self->m_y = y;
@@ -834,109 +906,118 @@ wxPyInputStream *new_wxPyInputStream(PyObject *p){
         }
 
 SWIGSTATICINLINE(PyObject*)
-SWIG_FromChar(char c) 
+  SWIG_From_char(char c) 
 { 
   return PyString_FromStringAndSize(&c,1);
 }
 
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
 
-/* returns '1' if the input is a raw char*, '0' if is a PyString */
+/* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */
 SWIGSTATIC(int)
-SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* size)
+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize)
 {
   static swig_type_info* pchar_info = 0;
-  int psize = 0;
+  char* vptr = 0;
   if (!pchar_info) pchar_info = SWIG_TypeQuery("char *");
-
-  if (SWIG_ConvertPtr(obj, swig_reinterpret_cast(void **,cptr), pchar_info, 0) == -1) {
-    PyErr_Clear();
-    PyString_AsStringAndSize(obj, cptr, &psize);
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      PyErr_SetString(PyExc_TypeError,"a string is expected");
-    }
-    if (size) *size = psize;
-    return 0;
+  if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_info, 0) != -1) {
+    if (cptr) *cptr = vptr;
+    if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0;
+    return SWIG_OLDOBJ;
   } else {
-    if (size) *size = (*cptr) ? (strlen(*cptr) + 1) : 0;
-    return 1;
+    if (PyString_Check(obj)) {
+      if (cptr) {
+       *cptr = PyString_AS_STRING(obj);
+       if (psize) {
+         *psize = PyString_GET_SIZE(obj) + 1;
+       }
+      }
+      return SWIG_PYSTR;
+    }
   }
+  if (cptr) {
+    PyErr_SetString(PyExc_TypeError, "a string is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATIC(void)
-SWIG_AsCharArray(PyObject *obj, char* carray, size_t size)
+SWIGSTATIC(int)
+SWIG_AsCharArray(PyObject *obj, char *val, size_t size)
 { 
   char* cptr; size_t csize;  
-  SWIG_AsCharPtrAndSize(obj, &cptr, &csize);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    PyObject *err =  
-      PyString_FromFormat("a char array of size %d is expected", size);
-    PyErr_SetObject(PyExc_TypeError, err);
-    Py_DECREF(err);
-  } else {
-    /* in C (but not in C++) you can do: 
-       
+  if (SWIG_AsCharPtrAndSize(obj, &cptr, &csize)) {
+    /* in C you can do:        
+
          char x[5] = "hello"; 
 
         ie, assing the array using an extra '0' char.
     */
-#ifndef __cplusplus
     if ((csize == size + 1) && !(cptr[csize-1])) --csize;
-#endif
-    if (csize > size) {
-      PyObject *err =  
-         PyString_FromFormat("a char array of maximum size %d is expected", 
-                            size);
-      PyErr_SetObject(PyExc_TypeError, err);
-      Py_DECREF(err);
-    } else {
-      if (csize) memcpy(carray, cptr, csize);
-      if (csize < size) memset(carray + csize, 0, size - csize);
+    if (csize <= size) {
+      if (val) {
+       if (csize) memcpy(val, cptr, csize);
+       if (csize < size) memset(val + csize, 0, size - csize);
+      }
+      return 1;
     }
   }
+  if (val) {
+    PyErr_Format(PyExc_TypeError, 
+                "a char array of maximum size %ld is expected", 
+                size);
+  }
+  return 0;
 }
 
 
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_char(PyObject *obj, char *val)
+{
+  const char* errmsg = val ? "char" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, CHAR_MIN,CHAR_MAX, errmsg)) {
+      if (val) *val = v;
+      return 1;
+    } else {
+      return 0;
+    }    
+  } else {
+    PyErr_Clear();
+    return SWIG_AsCharArray(obj, val, 1);
+  }
+ }
+
+
 SWIGSTATICINLINE(char)
-SWIG_AsChar(PyObject *obj)
-{ 
-  char c = 0;
-  if (PyInt_Check(obj) || PyLong_Check(obj)) {
-    c = swig_numeric_cast(char,
-      SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                           "char", CHAR_MIN, CHAR_MAX));
-  } else {  
-    SWIG_AsCharArray(obj, &c, 1);
-    if (PyErr_Occurred()) {
-      PyErr_Clear();
-      PyErr_SetString(PyExc_TypeError, "a char is expected");
-    }
+SWIG_As_char(PyObject* obj)
+{
+  char v;
+  if (!SWIG_AsVal_char(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(char));
   }
-  return c;
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckChar(PyObject* obj)
+SWIG_Check_char(PyObject* obj)
 {
-  SWIG_AsChar(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
-  }
+  return SWIG_AsVal_char(obj, (char*)0);
 }
 
 void wxOutputStream_write(wxOutputStream *self,PyObject *obj){
@@ -994,23 +1075,50 @@ IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler,
 IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext);
 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
@@ -1044,59 +1152,83 @@ SWIG_CheckBool(PyObject* obj)
 #include "wx/wxPython/pyistream.h"
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
-                             unsigned long max_value) 
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  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);
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
     }
-  }
-  return value;
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+SWIGSTATICINLINE(int)
+  SWIG_CheckUnsignedLongInRange(unsigned long value,
+                               unsigned long max_value,
+                               const char *errmsg) 
 {
-  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");
+  if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' minimum %ld",
+                  value, errmsg, max_value);
     }
-    return i;
+    return 0;
   }
-}
+  return 1;
+ }
 
 
-SWIGSTATICINLINE(unsigned char)
-SWIG_AsUnsignedChar(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_char(PyObject *obj, unsigned char *val)
 { 
-  return swig_numeric_cast(unsigned char,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned char", UCHAR_MAX));
+  const char* errmsg = val ? "unsigned char" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, UCHAR_MAX,errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned char);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned char is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedChar(PyObject* obj)
+SWIGSTATICINLINE(unsigned char)
+SWIG_As_unsigned_SS_char(PyObject* obj)
 {
-  SWIG_AsUnsignedChar(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned char v;
+  if (!SWIG_AsVal_unsigned_SS_char(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned char));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_char(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_char(obj, (unsigned char*)0);
+}
+
+
 wxImage *new_wxImage(int width,int height,bool clear){
             if (width > 0 && height > 0)
                 return new wxImage(width, height, clear);
@@ -1213,16 +1345,26 @@ void wxImage_SetAlphaBuffer(wxImage *self,PyObject *data){
             wxPyEndBlockThreads(blocked);
         }
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 wxBitmap wxImage_ConvertToBitmap(wxImage *self){
@@ -1281,6 +1423,7 @@ void wxEvtHandler__setOORInfo(wxEvtHandler *self,PyObject *_self){
                 }
             }
         }
+
 int wxKeyEvent_GetUnicodeKey(wxKeyEvent *self){
         #if wxUSE_UNICODE
             return self->GetUnicodeKey();
@@ -1290,35 +1433,64 @@ int wxKeyEvent_GetUnicodeKey(wxKeyEvent *self){
         }
 
 #if UINT_MAX < LONG_MAX
-#define SWIG_FromUnsignedInt    SWIG_FromLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_long
+/*@@*/
 #else
-#define SWIG_FromUnsignedInt    SWIG_FromUnsignedLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long
+/*@@*/
 #endif
 
 
 #if UINT_MAX != ULONG_MAX
-SWIGSTATICINLINE(unsigned int)
-SWIG_AsUnsignedInt(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 { 
-  return swig_numeric_cast(unsigned int,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned int", UINT_MAX));
+  const char* errmsg = val ? "unsigned int" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned int);
+      return 1;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong
+SWIGSTATICINLINE(unsigned int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedInt(PyObject* obj)
+SWIGSTATICINLINE(unsigned int)
+SWIG_As_unsigned_SS_int(PyObject* obj)
 {
-  SWIG_AsUnsignedInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned int v;
+  if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_int(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0);
 }
 
 void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){
@@ -1496,49 +1668,71 @@ wxSizerItem *new_wxSizerItem(wxSizer *sizer,int proportion,int flag,int border,P
         }
 
 #include <float.h>
+SWIGSTATICINLINE(int)
+  SWIG_CheckDoubleInRange(double value, double min_value, 
+                         double max_value, const char* errmsg)
+{
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %g is less than %s minimum %g", 
+                  value, errmsg, min_value);
+    }
+    return 0;
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %g is greater than %s maximum %g", 
+                  value, errmsg, max_value);
+    }
+    return 0;
+  }
+  return 1;
+}
+
 
-SWIGSTATIC(float)
-SWIG_FloatCast(double value)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_float(PyObject *obj, float *val)
 {
-  float f = 0;
-  if (!PyErr_Occurred()) {
-    if (value < FLT_MIN) {
-      PyObject *err = 
-        PyString_FromFormat("value %g is less than float minimum %g", 
-                           value, FLT_MIN);
-      PyErr_SetObject(PyExc_OverflowError, err);
-      Py_DECREF(err);
-    } else if (value > FLT_MAX) {
-      PyObject *err = 
-        PyString_FromFormat("value %g is greater than float maximum %g", 
-                           value, FLT_MAX);
-      PyErr_SetObject(PyExc_OverflowError, err);
-      Py_DECREF(err);
+  const char* errmsg = val ? "float" : 0;
+  double v;
+  if (SWIG_AsVal_double(obj, &v)) {
+    if (SWIG_CheckDoubleInRange(v, -FLT_MAX, FLT_MAX, errmsg)) {
+      if (val) *val = v;
+      return 1;
     } else {
-      f = swig_numeric_cast(float, value);
+      return 0;
     }
+  } else {
+    PyErr_Clear();
   }
-  return f;
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a float is expected");
+  }
+  return 0;
 }
 
 
 SWIGSTATICINLINE(float)
-SWIG_AsFloat(PyObject *obj)
+SWIG_As_float(PyObject* obj)
 {
-  return SWIG_FloatCast(SWIG_AsDouble(obj));
+  float v;
+  if (!SWIG_AsVal_float(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(float));
+  }
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckFloat(PyObject* obj)
+SWIG_Check_float(PyObject* obj)
 {
-  SWIG_AsFloat(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
-  }
+  return SWIG_AsVal_float(obj, (float*)0);
 }
 
 PyObject *wxSizerItem_GetUserData(wxSizerItem *self){
@@ -1846,7 +2040,7 @@ bool wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_EmptyString_set(PyObject *_val) {
+static int _wrap_EmptyString_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable EmptyString is read-only.");
     return 1;
 }
@@ -1866,7 +2060,7 @@ static PyObject *_wrap_EmptyString_get() {
 }
 
 
-static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Object_GetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
     wxString result;
@@ -1898,7 +2092,7 @@ static PyObject *_wrap_Object_GetClassName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Object_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Object_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxObject *arg1 = (wxObject *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1923,14 +2117,14 @@ static PyObject *_wrap_Object_Destroy(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * Object_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Object_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Size_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -1943,7 +2137,7 @@ static PyObject *_wrap_Size_width_set(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_width_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->x = arg2;
     
@@ -1954,7 +2148,7 @@ static PyObject *_wrap_Size_width_set(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Size_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -1968,14 +2162,14 @@ static PyObject *_wrap_Size_width_get(PyObject *self, PyObject *args, PyObject *
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->x);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Size_height_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_height_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -1988,7 +2182,7 @@ static PyObject *_wrap_Size_height_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_height_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->y = arg2;
     
@@ -1999,7 +2193,7 @@ static PyObject *_wrap_Size_height_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Size_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -2013,14 +2207,14 @@ static PyObject *_wrap_Size_height_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->y);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Size(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -2033,11 +2227,11 @@ static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Size",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2054,7 +2248,7 @@ static PyObject *_wrap_new_Size(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_delete_Size(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Size(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2079,7 +2273,7 @@ static PyObject *_wrap_delete_Size(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2114,7 +2308,7 @@ static PyObject *_wrap_Size___eq__(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2149,7 +2343,7 @@ static PyObject *_wrap_Size___ne__(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Size___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2186,7 +2380,7 @@ static PyObject *_wrap_Size___add__(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Size___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2223,7 +2417,7 @@ static PyObject *_wrap_Size___sub__(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Size_IncTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_IncTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2255,7 +2449,7 @@ static PyObject *_wrap_Size_IncTo(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Size_DecTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_DecTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2287,7 +2481,7 @@ static PyObject *_wrap_Size_DecTo(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -2302,9 +2496,9 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Size_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2320,7 +2514,7 @@ static PyObject *_wrap_Size_Set(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Size_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -2333,7 +2527,7 @@ static PyObject *_wrap_Size_SetWidth(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2349,7 +2543,7 @@ static PyObject *_wrap_Size_SetWidth(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Size_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int arg2 ;
@@ -2362,7 +2556,7 @@ static PyObject *_wrap_Size_SetHeight(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size_SetHeight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSize,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2378,7 +2572,7 @@ static PyObject *_wrap_Size_SetHeight(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Size_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -2397,14 +2591,14 @@ static PyObject *_wrap_Size_GetWidth(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     int result;
@@ -2423,14 +2617,14 @@ static PyObject *_wrap_Size_GetHeight(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Size_IsFullySpecified(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_IsFullySpecified(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     bool result;
@@ -2458,7 +2652,7 @@ static PyObject *_wrap_Size_IsFullySpecified(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Size_SetDefaults(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_SetDefaults(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2490,7 +2684,7 @@ static PyObject *_wrap_Size_SetDefaults(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Size_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize *arg1 = (wxSize *) 0 ;
     PyObject *result;
@@ -2516,14 +2710,14 @@ static PyObject *_wrap_Size_Get(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject * Size_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Size_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSize, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_RealPoint_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double arg2 ;
@@ -2536,7 +2730,7 @@ static PyObject *_wrap_RealPoint_x_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->x = arg2;
     
@@ -2547,7 +2741,7 @@ static PyObject *_wrap_RealPoint_x_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RealPoint_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double result;
@@ -2561,14 +2755,14 @@ static PyObject *_wrap_RealPoint_x_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (double) ((arg1)->x);
     
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RealPoint_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double arg2 ;
@@ -2581,7 +2775,7 @@ static PyObject *_wrap_RealPoint_y_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->y = arg2;
     
@@ -2592,7 +2786,7 @@ static PyObject *_wrap_RealPoint_y_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RealPoint_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double result;
@@ -2606,14 +2800,14 @@ static PyObject *_wrap_RealPoint_y_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (double) ((arg1)->y);
     
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RealPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -2626,11 +2820,11 @@ static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_RealPoint",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2647,7 +2841,7 @@ static PyObject *_wrap_new_RealPoint(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_RealPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_RealPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2672,7 +2866,7 @@ static PyObject *_wrap_delete_RealPoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -2707,7 +2901,7 @@ static PyObject *_wrap_RealPoint___eq__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -2742,7 +2936,7 @@ static PyObject *_wrap_RealPoint___ne__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -2779,7 +2973,7 @@ static PyObject *_wrap_RealPoint___add__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     wxRealPoint *arg2 = 0 ;
@@ -2816,7 +3010,7 @@ static PyObject *_wrap_RealPoint___sub__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     double arg2 ;
@@ -2831,9 +3025,9 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RealPoint_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRealPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2849,7 +3043,7 @@ static PyObject *_wrap_RealPoint_Set(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_RealPoint_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RealPoint_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRealPoint *arg1 = (wxRealPoint *) 0 ;
     PyObject *result;
@@ -2875,14 +3069,14 @@ static PyObject *_wrap_RealPoint_Get(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject * RealPoint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * RealPoint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRealPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Point_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int arg2 ;
@@ -2895,7 +3089,7 @@ static PyObject *_wrap_Point_x_set(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->x = arg2;
     
@@ -2906,7 +3100,7 @@ static PyObject *_wrap_Point_x_set(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Point_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int result;
@@ -2920,14 +3114,14 @@ static PyObject *_wrap_Point_x_get(PyObject *self, PyObject *args, PyObject *kwa
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->x);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int arg2 ;
@@ -2940,7 +3134,7 @@ static PyObject *_wrap_Point_y_set(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->y = arg2;
     
@@ -2951,7 +3145,7 @@ static PyObject *_wrap_Point_y_set(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Point_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     int result;
@@ -2965,14 +3159,14 @@ static PyObject *_wrap_Point_y_get(PyObject *self, PyObject *args, PyObject *kwa
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->y);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Point(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -2985,11 +3179,11 @@ static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwarg
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3006,7 +3200,7 @@ static PyObject *_wrap_new_Point(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_Point(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Point(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3031,7 +3225,7 @@ static PyObject *_wrap_delete_Point(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3066,7 +3260,7 @@ static PyObject *_wrap_Point___eq__(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3101,7 +3295,7 @@ static PyObject *_wrap_Point___ne__(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3138,7 +3332,7 @@ static PyObject *_wrap_Point___add__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3175,7 +3369,7 @@ static PyObject *_wrap_Point___sub__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3189,7 +3383,7 @@ static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___iadd__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -3204,14 +3398,14 @@ static PyObject *_wrap_Point___iadd__(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3225,7 +3419,7 @@ static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___isub__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
@@ -3240,14 +3434,14 @@ static PyObject *_wrap_Point___isub__(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     long arg2 ;
@@ -3262,9 +3456,9 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Point_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3280,7 +3474,7 @@ static PyObject *_wrap_Point_Set(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Point_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = (wxPoint *) 0 ;
     PyObject *result;
@@ -3306,14 +3500,14 @@ static PyObject *_wrap_Point_Get(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject * Point_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Point_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPoint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Rect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -3330,19 +3524,19 @@ static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Rect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3359,7 +3553,7 @@ static PyObject *_wrap_new_Rect(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_new_RectPP(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RectPP(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = 0 ;
     wxPoint *arg2 = 0 ;
@@ -3395,7 +3589,7 @@ static PyObject *_wrap_new_RectPP(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_RectPS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RectPS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = 0 ;
     wxSize *arg2 = 0 ;
@@ -3431,7 +3625,7 @@ static PyObject *_wrap_new_RectPS(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_Rect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Rect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3456,7 +3650,7 @@ static PyObject *_wrap_delete_Rect(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Rect_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3475,14 +3669,14 @@ static PyObject *_wrap_Rect_GetX(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -3495,7 +3689,7 @@ static PyObject *_wrap_Rect_SetX(PyObject *self, PyObject *args, PyObject *kwarg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3511,7 +3705,7 @@ static PyObject *_wrap_Rect_SetX(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Rect_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3530,14 +3724,14 @@ static PyObject *_wrap_Rect_GetY(PyObject *self, PyObject *args, PyObject *kwarg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -3550,7 +3744,7 @@ static PyObject *_wrap_Rect_SetY(PyObject *self, PyObject *args, PyObject *kwarg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3566,7 +3760,7 @@ static PyObject *_wrap_Rect_SetY(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Rect_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3585,14 +3779,14 @@ static PyObject *_wrap_Rect_GetWidth(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -3605,7 +3799,7 @@ static PyObject *_wrap_Rect_SetWidth(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3621,7 +3815,7 @@ static PyObject *_wrap_Rect_SetWidth(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Rect_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3640,14 +3834,14 @@ static PyObject *_wrap_Rect_GetHeight(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -3660,7 +3854,7 @@ static PyObject *_wrap_Rect_SetHeight(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetHeight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3676,7 +3870,7 @@ static PyObject *_wrap_Rect_SetHeight(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Rect_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint result;
@@ -3706,7 +3900,7 @@ static PyObject *_wrap_Rect_GetPosition(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Rect_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3738,7 +3932,7 @@ static PyObject *_wrap_Rect_SetPosition(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Rect_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxSize result;
@@ -3768,7 +3962,7 @@ static PyObject *_wrap_Rect_GetSize(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Rect_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3800,7 +3994,7 @@ static PyObject *_wrap_Rect_SetSize(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Rect_GetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint result;
@@ -3830,7 +4024,7 @@ static PyObject *_wrap_Rect_GetTopLeft(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Rect_SetTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3862,7 +4056,7 @@ static PyObject *_wrap_Rect_SetTopLeft(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Rect_GetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint result;
@@ -3892,7 +4086,7 @@ static PyObject *_wrap_Rect_GetBottomRight(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Rect_SetBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3924,7 +4118,7 @@ static PyObject *_wrap_Rect_SetBottomRight(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3943,14 +4137,14 @@ static PyObject *_wrap_Rect_GetLeft(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_GetTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3969,14 +4163,14 @@ static PyObject *_wrap_Rect_GetTop(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_GetBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetBottom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -3995,14 +4189,14 @@ static PyObject *_wrap_Rect_GetBottom(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_GetRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_GetRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -4021,14 +4215,14 @@ static PyObject *_wrap_Rect_GetRight(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_SetLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4041,7 +4235,7 @@ static PyObject *_wrap_Rect_SetLeft(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetLeft",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4057,7 +4251,7 @@ static PyObject *_wrap_Rect_SetLeft(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Rect_SetRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4070,7 +4264,7 @@ static PyObject *_wrap_Rect_SetRight(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetRight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4086,7 +4280,7 @@ static PyObject *_wrap_Rect_SetRight(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Rect_SetTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4099,7 +4293,7 @@ static PyObject *_wrap_Rect_SetTop(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetTop",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4115,7 +4309,7 @@ static PyObject *_wrap_Rect_SetTop(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_SetBottom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4128,7 +4322,7 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_SetBottom",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4144,7 +4338,7 @@ static PyObject *_wrap_Rect_SetBottom(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Inflate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4160,9 +4354,9 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Inflate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4181,7 +4375,7 @@ static PyObject *_wrap_Rect_Inflate(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Deflate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4197,9 +4391,9 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_Deflate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4218,7 +4412,7 @@ static PyObject *_wrap_Rect_Deflate(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_OffsetXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4233,9 +4427,9 @@ static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_OffsetXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4251,7 +4445,7 @@ static PyObject *_wrap_Rect_OffsetXY(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Rect_Offset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Offset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4283,7 +4477,7 @@ static PyObject *_wrap_Rect_Offset(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Rect_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Intersect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4319,7 +4513,7 @@ static PyObject *_wrap_Rect_Intersect(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Rect___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4356,7 +4550,7 @@ static PyObject *_wrap_Rect___add__(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Rect___iadd__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4370,7 +4564,7 @@ static PyObject *_wrap_Rect___iadd__(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___iadd__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
@@ -4385,14 +4579,14 @@ static PyObject *_wrap_Rect___iadd__(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4427,7 +4621,7 @@ static PyObject *_wrap_Rect___eq__(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4462,7 +4656,7 @@ static PyObject *_wrap_Rect___ne__(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_InsideXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4478,9 +4672,9 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Rect_InsideXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4498,7 +4692,7 @@ static PyObject *_wrap_Rect_InsideXY(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Inside(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4533,7 +4727,7 @@ static PyObject *_wrap_Rect_Inside(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Intersects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4568,7 +4762,7 @@ static PyObject *_wrap_Rect_Intersects(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Rect_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4581,7 +4775,7 @@ static PyObject *_wrap_Rect_x_set(PyObject *self, PyObject *args, PyObject *kwar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->x = arg2;
     
@@ -4592,7 +4786,7 @@ static PyObject *_wrap_Rect_x_set(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Rect_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -4606,14 +4800,14 @@ static PyObject *_wrap_Rect_x_get(PyObject *self, PyObject *args, PyObject *kwar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->x);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4626,7 +4820,7 @@ static PyObject *_wrap_Rect_y_set(PyObject *self, PyObject *args, PyObject *kwar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->y = arg2;
     
@@ -4637,7 +4831,7 @@ static PyObject *_wrap_Rect_y_set(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Rect_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -4651,14 +4845,14 @@ static PyObject *_wrap_Rect_y_get(PyObject *self, PyObject *args, PyObject *kwar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->y);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_width_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4671,7 +4865,7 @@ static PyObject *_wrap_Rect_width_set(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_width_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->width = arg2;
     
@@ -4682,7 +4876,7 @@ static PyObject *_wrap_Rect_width_set(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Rect_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -4696,14 +4890,14 @@ static PyObject *_wrap_Rect_width_get(PyObject *self, PyObject *args, PyObject *
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->width);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_height_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_height_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 ;
@@ -4716,7 +4910,7 @@ static PyObject *_wrap_Rect_height_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect_height_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->height = arg2;
     
@@ -4727,7 +4921,7 @@ static PyObject *_wrap_Rect_height_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Rect_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int result;
@@ -4741,14 +4935,14 @@ static PyObject *_wrap_Rect_height_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->height);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     int arg2 = (int) 0 ;
@@ -4768,19 +4962,19 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxRect,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4797,7 +4991,7 @@ static PyObject *_wrap_Rect_Set(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Rect_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Rect_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     PyObject *result;
@@ -4823,14 +5017,14 @@ static PyObject *_wrap_Rect_Get(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject * Rect_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Rect_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRect, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_IntersectRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IntersectRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect *arg1 = (wxRect *) 0 ;
     wxRect *arg2 = (wxRect *) 0 ;
@@ -4861,7 +5055,7 @@ static PyObject *_wrap_IntersectRect(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Point2D(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 = (double) 0.0 ;
     double arg2 = (double) 0.0 ;
@@ -4874,11 +5068,11 @@ static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwa
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Point2D",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (double) SWIG_AsDouble(obj0); 
+        arg1 = (double)SWIG_As_double(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4895,7 +5089,7 @@ static PyObject *_wrap_new_Point2D(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_Point2DCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Point2DCopy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = 0 ;
     wxPoint2D *result;
@@ -4924,7 +5118,7 @@ static PyObject *_wrap_new_Point2DCopy(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_Point2DFromPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Point2DFromPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = 0 ;
     wxPoint2D *result;
@@ -4953,20 +5147,22 @@ static PyObject *_wrap_new_Point2DFromPoint(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Point2D_GetFloor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetFloor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetFloor",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -4978,34 +5174,32 @@ static PyObject *_wrap_Point2D_GetFloor(PyObject *self, PyObject *args, PyObject
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_GetRounded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetRounded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Point2D_GetRounded",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -5017,21 +5211,17 @@ static PyObject *_wrap_Point2D_GetRounded(PyObject *self, PyObject *args, PyObje
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_GetVectorLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetVectorLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -5050,14 +5240,14 @@ static PyObject *_wrap_Point2D_GetVectorLength(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -5076,14 +5266,14 @@ static PyObject *_wrap_Point2D_GetVectorAngle(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_SetVectorLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_SetVectorLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -5096,7 +5286,7 @@ static PyObject *_wrap_Point2D_SetVectorLength(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5112,7 +5302,7 @@ static PyObject *_wrap_Point2D_SetVectorLength(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -5125,7 +5315,7 @@ static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_SetVectorAngle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5141,7 +5331,7 @@ static PyObject *_wrap_Point2D_SetVectorAngle(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Point2D_GetDistance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetDistance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5167,14 +5357,14 @@ static PyObject *_wrap_Point2D_GetDistance(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5200,14 +5390,14 @@ static PyObject *_wrap_Point2D_GetDistanceSquare(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_GetDotProduct(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetDotProduct(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5233,14 +5423,14 @@ static PyObject *_wrap_Point2D_GetDotProduct(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5266,14 +5456,14 @@ static PyObject *_wrap_Point2D_GetCrossProduct(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D___neg__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___neg__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D result;
@@ -5303,7 +5493,7 @@ static PyObject *_wrap_Point2D___neg__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Point2D___iadd__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5317,7 +5507,7 @@ static PyObject *_wrap_Point2D___iadd__(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___iadd__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
@@ -5332,14 +5522,14 @@ static PyObject *_wrap_Point2D___iadd__(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D___isub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5353,7 +5543,7 @@ static PyObject *_wrap_Point2D___isub__(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___isub__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
@@ -5368,14 +5558,14 @@ static PyObject *_wrap_Point2D___isub__(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D___imul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___imul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5389,7 +5579,7 @@ static PyObject *_wrap_Point2D___imul__(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___imul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
@@ -5404,14 +5594,14 @@ static PyObject *_wrap_Point2D___imul__(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D___idiv__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___idiv__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5425,7 +5615,7 @@ static PyObject *_wrap_Point2D___idiv__(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___idiv__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     {
         arg2 = &temp2;
         if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
@@ -5440,14 +5630,14 @@ static PyObject *_wrap_Point2D___idiv__(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint2D, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5482,7 +5672,7 @@ static PyObject *_wrap_Point2D___eq__(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     wxPoint2D *arg2 = 0 ;
@@ -5517,7 +5707,7 @@ static PyObject *_wrap_Point2D___ne__(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -5530,7 +5720,7 @@ static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_x = arg2;
     
@@ -5541,7 +5731,7 @@ static PyObject *_wrap_Point2D_x_set(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Point2D_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -5555,14 +5745,14 @@ static PyObject *_wrap_Point2D_x_get(PyObject *self, PyObject *args, PyObject *k
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (double) ((arg1)->m_x);
     
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 ;
@@ -5575,7 +5765,7 @@ static PyObject *_wrap_Point2D_y_set(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_y = arg2;
     
@@ -5586,7 +5776,7 @@ static PyObject *_wrap_Point2D_y_set(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Point2D_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double result;
@@ -5600,14 +5790,14 @@ static PyObject *_wrap_Point2D_y_get(PyObject *self, PyObject *args, PyObject *k
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (double) ((arg1)->m_y);
     
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     double arg2 = (double) 0 ;
@@ -5623,11 +5813,11 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPoint2D,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (double) SWIG_AsDouble(obj1); 
+        arg2 = (double)SWIG_As_double(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (double) SWIG_AsDouble(obj2); 
+        arg3 = (double)SWIG_As_double(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5644,7 +5834,7 @@ static PyObject *_wrap_Point2D_Set(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Point2D_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Point2D_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint2D *arg1 = (wxPoint2D *) 0 ;
     PyObject *result;
@@ -5670,14 +5860,14 @@ static PyObject *_wrap_Point2D_Get(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject * Point2D_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Point2D_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPoint2D, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_DefaultPosition_set(PyObject *_val) {
+static int _wrap_DefaultPosition_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DefaultPosition is read-only.");
     return 1;
 }
@@ -5691,7 +5881,7 @@ static PyObject *_wrap_DefaultPosition_get() {
 }
 
 
-static int _wrap_DefaultSize_set(PyObject *_val) {
+static int _wrap_DefaultSize_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DefaultSize is read-only.");
     return 1;
 }
@@ -5705,7 +5895,7 @@ static PyObject *_wrap_DefaultSize_get() {
 }
 
 
-static PyObject *_wrap_new_InputStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_InputStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     wxPyInputStream *result;
@@ -5730,7 +5920,7 @@ static PyObject *_wrap_new_InputStream(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_InputStream_close(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_close(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5755,7 +5945,7 @@ static PyObject *_wrap_InputStream_close(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_InputStream_flush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_flush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5780,7 +5970,7 @@ static PyObject *_wrap_InputStream_flush(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_eof(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     bool result;
@@ -5808,7 +5998,7 @@ static PyObject *_wrap_InputStream_eof(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_InputStream_read(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_read(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     int arg2 = (int) -1 ;
@@ -5823,7 +6013,7 @@ static PyObject *_wrap_InputStream_read(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5840,7 +6030,7 @@ static PyObject *_wrap_InputStream_read(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_InputStream_readline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_readline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     int arg2 = (int) -1 ;
@@ -5855,7 +6045,7 @@ static PyObject *_wrap_InputStream_readline(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5872,7 +6062,7 @@ static PyObject *_wrap_InputStream_readline(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_InputStream_readlines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_readlines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     int arg2 = (int) -1 ;
@@ -5887,7 +6077,7 @@ static PyObject *_wrap_InputStream_readlines(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5904,7 +6094,7 @@ static PyObject *_wrap_InputStream_readlines(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_InputStream_seek(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_seek(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     int arg2 ;
@@ -5919,10 +6109,10 @@ static PyObject *_wrap_InputStream_seek(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_seek",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5939,7 +6129,7 @@ static PyObject *_wrap_InputStream_seek(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_InputStream_tell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_tell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     int result;
@@ -5958,14 +6148,14 @@ static PyObject *_wrap_InputStream_tell(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_InputStream_Peek(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_Peek(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     char result;
@@ -5984,14 +6174,14 @@ static PyObject *_wrap_InputStream_Peek(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromChar((char)result);
+    resultobj = SWIG_From_char((char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_InputStream_GetC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_GetC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     char result;
@@ -6010,14 +6200,14 @@ static PyObject *_wrap_InputStream_GetC(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromChar((char)result);
+    resultobj = SWIG_From_char((char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_InputStream_LastRead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_LastRead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     size_t result;
@@ -6036,14 +6226,14 @@ static PyObject *_wrap_InputStream_LastRead(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     bool result;
@@ -6071,7 +6261,7 @@ static PyObject *_wrap_InputStream_CanRead(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_Eof(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     bool result;
@@ -6099,7 +6289,7 @@ static PyObject *_wrap_InputStream_Eof(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_Ungetch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     char arg2 ;
@@ -6113,7 +6303,7 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:InputStream_Ungetch",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (char) SWIG_AsChar(obj1); 
+    arg2 = (char)SWIG_As_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6131,7 +6321,7 @@ static PyObject *_wrap_InputStream_Ungetch(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_SeekI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     long arg2 ;
@@ -6147,10 +6337,10 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:InputStream_SeekI",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxSeekMode) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6160,14 +6350,14 @@ static PyObject *_wrap_InputStream_SeekI(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_InputStream_TellI(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InputStream_TellI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
     long result;
@@ -6186,21 +6376,21 @@ static PyObject *_wrap_InputStream_TellI(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * InputStream_swigregister(PyObject *self, PyObject *args) {
+static PyObject * InputStream_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyInputStream, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_OutputStream_write(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_OutputStream_write(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxOutputStream *arg1 = (wxOutputStream *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -6228,14 +6418,14 @@ static PyObject *_wrap_OutputStream_write(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * OutputStream_swigregister(PyObject *self, PyObject *args) {
+static PyObject * OutputStream_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxOutputStream, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FSFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = (wxInputStream *) 0 ;
     wxString *arg2 = 0 ;
@@ -6339,7 +6529,7 @@ static PyObject *_wrap_new_FSFile(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_FSFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FSFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6364,7 +6554,7 @@ static PyObject *_wrap_delete_FSFile(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_FSFile_GetStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxInputStream *result;
@@ -6397,7 +6587,7 @@ static PyObject *_wrap_FSFile_GetStream(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FSFile_GetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxString *result;
@@ -6432,7 +6622,7 @@ static PyObject *_wrap_FSFile_GetMimeType(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FSFile_GetLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxString *result;
@@ -6467,7 +6657,7 @@ static PyObject *_wrap_FSFile_GetLocation(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FSFile_GetAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxString *result;
@@ -6502,7 +6692,7 @@ static PyObject *_wrap_FSFile_GetAnchor(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FSFile_GetModificationTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FSFile_GetModificationTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFSFile *arg1 = (wxFSFile *) 0 ;
     wxDateTime result;
@@ -6532,21 +6722,21 @@ static PyObject *_wrap_FSFile_GetModificationTime(PyObject *self, PyObject *args
 }
 
 
-static PyObject * FSFile_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FSFile_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFSFile, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject * CPPFileSystemHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CPPFileSystemHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileSystemHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileSystemHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileSystemHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *result;
     char *kwnames[] = {
@@ -6568,7 +6758,7 @@ static PyObject *_wrap_new_FileSystemHandler(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_FileSystemHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -6599,7 +6789,7 @@ static PyObject *_wrap_FileSystemHandler__setCallbackInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -6643,7 +6833,7 @@ static PyObject *_wrap_FileSystemHandler_CanOpen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -6696,7 +6886,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -6719,7 +6909,7 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6750,7 +6940,7 @@ static PyObject *_wrap_FileSystemHandler_FindFirst(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FileSystemHandler_FindNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString result;
@@ -6782,7 +6972,7 @@ static PyObject *_wrap_FileSystemHandler_FindNext(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -6830,7 +7020,7 @@ static PyObject *_wrap_FileSystemHandler_GetProtocol(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -6878,7 +7068,7 @@ static PyObject *_wrap_FileSystemHandler_GetLeftLocation(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -6926,7 +7116,7 @@ static PyObject *_wrap_FileSystemHandler_GetAnchor(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -6974,7 +7164,7 @@ static PyObject *_wrap_FileSystemHandler_GetRightLocation(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileSystemHandler *arg1 = (wxPyFileSystemHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -7022,14 +7212,14 @@ static PyObject *_wrap_FileSystemHandler_GetMimeTypeFromExt(PyObject *self, PyOb
 }
 
 
-static PyObject * FileSystemHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileSystemHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyFileSystemHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileSystem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *result;
     char *kwnames[] = {
@@ -7053,7 +7243,7 @@ static PyObject *_wrap_new_FileSystem(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_FileSystem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7078,7 +7268,7 @@ static PyObject *_wrap_delete_FileSystem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
@@ -7100,7 +7290,7 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7125,7 +7315,7 @@ static PyObject *_wrap_FileSystem_ChangePathTo(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileSystem_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString result;
@@ -7157,7 +7347,7 @@ static PyObject *_wrap_FileSystem_GetPath(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
@@ -7201,7 +7391,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString *arg2 = 0 ;
@@ -7224,7 +7414,7 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7255,7 +7445,7 @@ static PyObject *_wrap_FileSystem_FindFirst(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileSystem_FindNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystem *arg1 = (wxFileSystem *) 0 ;
     wxString result;
@@ -7287,7 +7477,7 @@ static PyObject *_wrap_FileSystem_FindNext(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FileSystem_AddHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileSystemHandler *arg1 = (wxFileSystemHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7312,7 +7502,7 @@ static PyObject *_wrap_FileSystem_AddHandler(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_FileSystem_CleanUpHandlers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_CleanUpHandlers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7333,7 +7523,7 @@ static PyObject *_wrap_FileSystem_CleanUpHandlers(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -7377,14 +7567,14 @@ static PyObject *_wrap_FileSystem_FileNameToURL(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * FileSystem_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileSystem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileSystem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSystem_URLToFileName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -7428,7 +7618,7 @@ static PyObject *_wrap_FileSystem_URLToFileName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_InternetFSHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_InternetFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *result;
     char *kwnames[] = {
@@ -7450,7 +7640,7 @@ static PyObject *_wrap_new_InternetFSHandler(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -7494,7 +7684,7 @@ static PyObject *_wrap_InternetFSHandler_CanOpen(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInternetFSHandler *arg1 = (wxInternetFSHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -7547,14 +7737,14 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject * InternetFSHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * InternetFSHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxInternetFSHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ZipFSHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ZipFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *result;
     char *kwnames[] = {
@@ -7576,7 +7766,7 @@ static PyObject *_wrap_new_ZipFSHandler(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -7620,7 +7810,7 @@ static PyObject *_wrap_ZipFSHandler_CanOpen(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -7673,7 +7863,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -7696,7 +7886,7 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7727,7 +7917,7 @@ static PyObject *_wrap_ZipFSHandler_FindFirst(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ZipFSHandler_FindNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ZipFSHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxZipFSHandler *arg1 = (wxZipFSHandler *) 0 ;
     wxString result;
@@ -7759,14 +7949,14 @@ static PyObject *_wrap_ZipFSHandler_FindNext(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * ZipFSHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ZipFSHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxZipFSHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxImage *arg2 = 0 ;
@@ -7792,7 +7982,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7816,7 +8006,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxBitmap *arg2 = 0 ;
@@ -7842,7 +8032,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7866,7 +8056,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxBitmap(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -7906,7 +8096,7 @@ static PyObject *_wrap___wxMemoryFSHandler_AddFile_Data(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_new_MemoryFSHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MemoryFSHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *result;
     char *kwnames[] = {
@@ -7928,7 +8118,7 @@ static PyObject *_wrap_new_MemoryFSHandler(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -7965,7 +8155,7 @@ static PyObject *_wrap_MemoryFSHandler_RemoveFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -8009,7 +8199,7 @@ static PyObject *_wrap_MemoryFSHandler_CanOpen(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxFileSystem *arg2 = 0 ;
@@ -8062,7 +8252,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -8085,7 +8275,7 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args,
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8116,7 +8306,7 @@ static PyObject *_wrap_MemoryFSHandler_FindFirst(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MemoryFSHandler_FindNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryFSHandler_FindNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryFSHandler *arg1 = (wxMemoryFSHandler *) 0 ;
     wxString result;
@@ -8148,14 +8338,14 @@ static PyObject *_wrap_MemoryFSHandler_FindNext(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * MemoryFSHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MemoryFSHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMemoryFSHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_ImageHandler_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString result;
@@ -8187,7 +8377,7 @@ static PyObject *_wrap_ImageHandler_GetName(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ImageHandler_GetExtension(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetExtension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString result;
@@ -8219,7 +8409,7 @@ static PyObject *_wrap_ImageHandler_GetExtension(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ImageHandler_GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     long result;
@@ -8238,14 +8428,14 @@ static PyObject *_wrap_ImageHandler_GetType(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ImageHandler_GetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString result;
@@ -8277,7 +8467,7 @@ static PyObject *_wrap_ImageHandler_GetMimeType(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -8321,7 +8511,7 @@ static PyObject *_wrap_ImageHandler_CanRead(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -8362,7 +8552,7 @@ static PyObject *_wrap_ImageHandler_SetName(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetExtension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -8403,7 +8593,7 @@ static PyObject *_wrap_ImageHandler_SetExtension(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ImageHandler_SetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     long arg2 ;
@@ -8416,7 +8606,7 @@ static PyObject *_wrap_ImageHandler_SetType(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHandler_SetType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8432,7 +8622,7 @@ static PyObject *_wrap_ImageHandler_SetType(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     wxString *arg2 = 0 ;
@@ -8473,14 +8663,14 @@ static PyObject *_wrap_ImageHandler_SetMimeType(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * ImageHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ImageHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImageHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ImageHistogram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageHistogram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *result;
     char *kwnames[] = {
@@ -8502,7 +8692,7 @@ static PyObject *_wrap_new_ImageHistogram(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned char arg1 ;
     unsigned char arg2 ;
@@ -8516,11 +8706,11 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (unsigned char) SWIG_AsUnsignedChar(obj0); 
+    arg1 = (unsigned char)SWIG_As_unsigned_SS_char(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8529,14 +8719,14 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHistogram *arg1 = (wxImageHistogram *) 0 ;
     unsigned char *arg2 = (unsigned char *) 0 ;
@@ -8547,8 +8737,11 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb
     unsigned char arg7 = (unsigned char) 0 ;
     bool result;
     unsigned char temp2 ;
+    int res2 = 0 ;
     unsigned char temp3 ;
+    int res3 = 0 ;
     unsigned char temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8557,22 +8750,22 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb
         (char *) "self",(char *) "startR",(char *) "startG",(char *) "startB", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:ImageHistogram_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImageHistogram,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg5 = (unsigned char) SWIG_AsUnsignedChar(obj1); 
+        arg5 = (unsigned char)SWIG_As_unsigned_SS_char(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg6 = (unsigned char) SWIG_AsUnsignedChar(obj2); 
+        arg6 = (unsigned char)SWIG_As_unsigned_SS_char(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg7 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+        arg7 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8585,32 +8778,26 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *self, PyOb
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_unsigned_char, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_unsigned_char, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_unsigned_char, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * ImageHistogram_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ImageHistogram_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImageHistogram, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Image(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
@@ -8631,11 +8818,11 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8660,7 +8847,7 @@ static PyObject *_wrap_new_Image(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_Image(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Image(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8685,7 +8872,7 @@ static PyObject *_wrap_delete_Image(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageFromMime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -8712,7 +8899,7 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8745,7 +8932,7 @@ static PyObject *_wrap_new_ImageFromMime(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageFromStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = 0 ;
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
@@ -8776,11 +8963,11 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8805,7 +8992,7 @@ static PyObject *_wrap_new_ImageFromStream(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageFromStreamMime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -8842,7 +9029,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8875,7 +9062,7 @@ static PyObject *_wrap_new_ImageFromStreamMime(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EmptyImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -8890,15 +9077,15 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_EmptyImage",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8915,7 +9102,7 @@ static PyObject *_wrap_new_EmptyImage(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_ImageFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageFromBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxImage *result;
@@ -8947,7 +9134,7 @@ static PyObject *_wrap_new_ImageFromBitmap(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageFromData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -8961,9 +9148,9 @@ static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:new_ImageFromData",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_unsigned_char,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -8981,7 +9168,7 @@ static PyObject *_wrap_new_ImageFromData(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Image_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -8996,9 +9183,9 @@ static PyObject *_wrap_Image_Create(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Create",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9014,7 +9201,7 @@ static PyObject *_wrap_Image_Create(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Image_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9039,7 +9226,7 @@ static PyObject *_wrap_Image_Destroy(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Scale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9055,9 +9242,9 @@ static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Scale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9077,7 +9264,7 @@ static PyObject *_wrap_Image_Scale(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ShrinkBy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9093,9 +9280,9 @@ static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_ShrinkBy",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9115,7 +9302,7 @@ static PyObject *_wrap_Image_ShrinkBy(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Rescale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9131,9 +9318,9 @@ static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Rescale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9152,7 +9339,7 @@ static PyObject *_wrap_Image_Rescale(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9173,15 +9360,15 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:Image_SetRGB",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (unsigned char) SWIG_AsUnsignedChar(obj4); 
+    arg5 = (unsigned char)SWIG_As_unsigned_SS_char(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (unsigned char) SWIG_AsUnsignedChar(obj5); 
+    arg6 = (unsigned char)SWIG_As_unsigned_SS_char(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9197,7 +9384,7 @@ static PyObject *_wrap_Image_SetRGB(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetRed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9213,9 +9400,9 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetRed",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9224,14 +9411,14 @@ static PyObject *_wrap_Image_GetRed(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetGreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9247,9 +9434,9 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetGreen",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9258,14 +9445,14 @@ static PyObject *_wrap_Image_GetGreen(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetBlue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9281,9 +9468,9 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetBlue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9292,14 +9479,14 @@ static PyObject *_wrap_Image_GetBlue(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_SetAlpha(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9316,11 +9503,11 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9336,7 +9523,7 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int arg2 ;
@@ -9352,9 +9539,9 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_GetAlpha",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9363,14 +9550,14 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_HasAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool result;
@@ -9398,7 +9585,7 @@ static PyObject *_wrap_Image_HasAlpha(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     byte *arg2 = (byte *) 0 ;
@@ -9409,8 +9596,11 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg
     byte arg7 = (byte) 0 ;
     bool result;
     byte temp2 ;
+    int res2 = 0 ;
     byte temp3 ;
+    int res3 = 0 ;
     byte temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -9419,22 +9609,22 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg
         (char *) "self",(char *) "startR",(char *) "startG",(char *) "startB", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:Image_FindFirstUnusedColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg5 = (byte) SWIG_AsUnsignedChar(obj1); 
+        arg5 = (byte)SWIG_As_unsigned_SS_char(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg6 = (byte) SWIG_AsUnsignedChar(obj2); 
+        arg6 = (byte)SWIG_As_unsigned_SS_char(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg7 = (byte) SWIG_AsUnsignedChar(obj3); 
+        arg7 = (byte)SWIG_As_unsigned_SS_char(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9447,25 +9637,19 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_byte, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_byte, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_byte, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     byte arg2 = (byte) 128 ;
@@ -9480,7 +9664,7 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (byte) SWIG_AsUnsignedChar(obj1); 
+        arg2 = (byte)SWIG_As_unsigned_SS_char(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9499,7 +9683,7 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetMaskFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxImage *arg2 = 0 ;
@@ -9526,11 +9710,11 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (byte) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (byte)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (byte) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (byte)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (byte) SWIG_AsUnsignedChar(obj4); 
+    arg5 = (byte)SWIG_As_unsigned_SS_char(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9548,7 +9732,7 @@ static PyObject *_wrap_Image_SetMaskFromImage(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_CanRead(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
@@ -9588,7 +9772,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetImageCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     long arg2 = (long) wxBITMAP_TYPE_ANY ;
@@ -9607,7 +9791,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9617,7 +9801,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp1)
         delete arg1;
@@ -9632,7 +9816,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -9657,11 +9841,11 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject *
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9688,7 +9872,7 @@ static PyObject *_wrap_Image_LoadFile(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadMimeFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -9719,7 +9903,7 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9754,7 +9938,7 @@ static PyObject *_wrap_Image_LoadMimeFile(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SaveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -9776,7 +9960,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject *
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9802,7 +9986,7 @@ static PyObject *_wrap_Image_SaveFile(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SaveMimeFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -9862,7 +10046,7 @@ static PyObject *_wrap_Image_SaveMimeFile(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_CanReadStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxInputStream *arg1 = 0 ;
     bool result;
@@ -9912,7 +10096,7 @@ static PyObject *_wrap_Image_CanReadStream(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxInputStream *arg2 = 0 ;
@@ -9947,11 +10131,11 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9978,7 +10162,7 @@ static PyObject *_wrap_Image_LoadStream(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_LoadMimeStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxInputStream *arg2 = 0 ;
@@ -10019,7 +10203,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10054,7 +10238,7 @@ static PyObject *_wrap_Image_LoadMimeStream(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool result;
@@ -10082,7 +10266,7 @@ static PyObject *_wrap_Image_Ok(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Image_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int result;
@@ -10101,14 +10285,14 @@ static PyObject *_wrap_Image_GetWidth(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     int result;
@@ -10127,14 +10311,14 @@ static PyObject *_wrap_Image_GetHeight(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxSize result;
@@ -10164,7 +10348,7 @@ static PyObject *_wrap_Image_GetSize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_GetSubImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetSubImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10201,7 +10385,7 @@ static PyObject *_wrap_Image_GetSubImage(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Image_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Copy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     SwigValueWrapper< wxImage > result;
@@ -10231,7 +10415,7 @@ static PyObject *_wrap_Image_Copy(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Image_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Paste(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxImage *arg2 = 0 ;
@@ -10255,9 +10439,9 @@ static PyObject *_wrap_Image_Paste(PyObject *self, PyObject *args, PyObject *kwa
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10273,7 +10457,7 @@ static PyObject *_wrap_Image_Paste(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Image_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -10299,7 +10483,7 @@ static PyObject *_wrap_Image_GetData(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10327,7 +10511,7 @@ static PyObject *_wrap_Image_SetData(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_GetDataBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -10353,7 +10537,7 @@ static PyObject *_wrap_Image_GetDataBuffer(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_SetDataBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10381,7 +10565,7 @@ static PyObject *_wrap_Image_SetDataBuffer(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_GetAlphaData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -10407,7 +10591,7 @@ static PyObject *_wrap_Image_GetAlphaData(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Image_SetAlphaData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10435,7 +10619,7 @@ static PyObject *_wrap_Image_SetAlphaData(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Image_GetAlphaBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *result;
@@ -10461,7 +10645,7 @@ static PyObject *_wrap_Image_GetAlphaBuffer(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10489,7 +10673,7 @@ static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Image_SetMaskColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char arg2 ;
@@ -10506,11 +10690,11 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_SetMaskColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10526,7 +10710,7 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_GetMaskRed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char result;
@@ -10545,14 +10729,14 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_GetMaskGreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char result;
@@ -10571,14 +10755,14 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetMaskBlue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char result;
@@ -10597,14 +10781,14 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool arg2 = (bool) True ;
@@ -10618,7 +10802,7 @@ static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10635,7 +10819,7 @@ static PyObject *_wrap_Image_SetMask(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_HasMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool result;
@@ -10663,7 +10847,7 @@ static PyObject *_wrap_Image_HasMask(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Rotate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     double arg2 ;
@@ -10684,14 +10868,14 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Image_Rotate",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -10716,7 +10900,7 @@ static PyObject *_wrap_Image_Rotate(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Rotate90(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool arg2 = (bool) True ;
@@ -10731,7 +10915,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10752,7 +10936,7 @@ static PyObject *_wrap_Image_Rotate90(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Mirror(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     bool arg2 = (bool) True ;
@@ -10767,7 +10951,7 @@ static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10788,7 +10972,7 @@ static PyObject *_wrap_Image_Mirror(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Image_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char arg2 ;
@@ -10811,17 +10995,17 @@ static PyObject *_wrap_Image_Replace(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:Image_Replace",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (unsigned char) SWIG_AsUnsignedChar(obj4); 
+    arg5 = (unsigned char)SWIG_As_unsigned_SS_char(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (unsigned char) SWIG_AsUnsignedChar(obj5); 
+    arg6 = (unsigned char)SWIG_As_unsigned_SS_char(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg7 = (unsigned char) SWIG_AsUnsignedChar(obj6); 
+    arg7 = (unsigned char)SWIG_As_unsigned_SS_char(obj6); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10837,7 +11021,7 @@ static PyObject *_wrap_Image_Replace(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertToMono(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char arg2 ;
@@ -10855,11 +11039,11 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMono",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10879,7 +11063,7 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -10936,7 +11120,7 @@ static PyObject *_wrap_Image_SetOption(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_SetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -10957,7 +11141,7 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10981,7 +11165,7 @@ static PyObject *_wrap_Image_SetOptionInt(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -11029,7 +11213,7 @@ static PyObject *_wrap_Image_GetOption(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -11056,7 +11240,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -11071,7 +11255,7 @@ static PyObject *_wrap_Image_GetOptionInt(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_HasOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxString *arg2 = 0 ;
@@ -11115,7 +11299,7 @@ static PyObject *_wrap_Image_HasOption(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_CountColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned long arg2 = (unsigned long) (unsigned long) -1 ;
@@ -11130,7 +11314,7 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (unsigned long)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11140,14 +11324,14 @@ static PyObject *_wrap_Image_CountColours(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_ComputeHistogram(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ComputeHistogram(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxImageHistogram *arg2 = 0 ;
@@ -11175,14 +11359,14 @@ static PyObject *_wrap_Image_ComputeHistogram(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Image_AddHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_AddHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11207,7 +11391,7 @@ static PyObject *_wrap_Image_AddHandler(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Image_InsertHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_InsertHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageHandler *arg1 = (wxImageHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11232,7 +11416,7 @@ static PyObject *_wrap_Image_InsertHandler(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_RemoveHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
@@ -11272,7 +11456,7 @@ static PyObject *_wrap_Image_RemoveHandler(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Image_GetImageExtWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_GetImageExtWildcard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -11300,7 +11484,7 @@ static PyObject *_wrap_Image_GetImageExtWildcard(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Image_ConvertToBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertToBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     wxBitmap result;
@@ -11331,7 +11515,7 @@ static PyObject *_wrap_Image_ConvertToBitmap(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = (wxImage *) 0 ;
     unsigned char arg2 ;
@@ -11349,11 +11533,11 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertToMonoBitmap",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned char) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (unsigned char) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (unsigned char) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -11374,14 +11558,14 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * Image_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Image_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImage, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_NullImage_set(PyObject *_val) {
+static int _wrap_NullImage_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullImage is read-only.");
     return 1;
 }
@@ -11395,7 +11579,7 @@ static PyObject *_wrap_NullImage_get() {
 }
 
 
-static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *_val) {
+static int _wrap_IMAGE_OPTION_BMP_FORMAT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_BMP_FORMAT is read-only.");
     return 1;
 }
@@ -11415,7 +11599,7 @@ static PyObject *_wrap_IMAGE_OPTION_BMP_FORMAT_get() {
 }
 
 
-static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set(PyObject *_val) {
+static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_X_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_CUR_HOTSPOT_X is read-only.");
     return 1;
 }
@@ -11435,7 +11619,7 @@ static PyObject *_wrap_IMAGE_OPTION_CUR_HOTSPOT_X_get() {
 }
 
 
-static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set(PyObject *_val) {
+static int _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_CUR_HOTSPOT_Y is read-only.");
     return 1;
 }
@@ -11455,7 +11639,7 @@ static PyObject *_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get() {
 }
 
 
-static int _wrap_IMAGE_OPTION_RESOLUTION_set(PyObject *_val) {
+static int _wrap_IMAGE_OPTION_RESOLUTION_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTION is read-only.");
     return 1;
 }
@@ -11475,7 +11659,7 @@ static PyObject *_wrap_IMAGE_OPTION_RESOLUTION_get() {
 }
 
 
-static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *_val) {
+static int _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable IMAGE_OPTION_RESOLUTIONUNIT is read-only.");
     return 1;
 }
@@ -11495,7 +11679,7 @@ static PyObject *_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get() {
 }
 
 
-static PyObject *_wrap_new_BMPHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BMPHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBMPHandler *result;
     char *kwnames[] = {
@@ -11517,14 +11701,14 @@ static PyObject *_wrap_new_BMPHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * BMPHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BMPHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBMPHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ICOHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ICOHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxICOHandler *result;
     char *kwnames[] = {
@@ -11546,14 +11730,14 @@ static PyObject *_wrap_new_ICOHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * ICOHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ICOHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxICOHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CURHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CURHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCURHandler *result;
     char *kwnames[] = {
@@ -11575,14 +11759,14 @@ static PyObject *_wrap_new_CURHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * CURHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CURHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCURHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ANIHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ANIHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxANIHandler *result;
     char *kwnames[] = {
@@ -11604,14 +11788,14 @@ static PyObject *_wrap_new_ANIHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * ANIHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ANIHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxANIHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PNGHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PNGHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPNGHandler *result;
     char *kwnames[] = {
@@ -11633,14 +11817,14 @@ static PyObject *_wrap_new_PNGHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * PNGHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PNGHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPNGHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GIFHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GIFHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGIFHandler *result;
     char *kwnames[] = {
@@ -11662,14 +11846,14 @@ static PyObject *_wrap_new_GIFHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * GIFHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GIFHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGIFHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PCXHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PCXHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPCXHandler *result;
     char *kwnames[] = {
@@ -11691,14 +11875,14 @@ static PyObject *_wrap_new_PCXHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * PCXHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PCXHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPCXHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_JPEGHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_JPEGHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJPEGHandler *result;
     char *kwnames[] = {
@@ -11720,14 +11904,14 @@ static PyObject *_wrap_new_JPEGHandler(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * JPEGHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * JPEGHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxJPEGHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PNMHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PNMHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPNMHandler *result;
     char *kwnames[] = {
@@ -11749,14 +11933,14 @@ static PyObject *_wrap_new_PNMHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * PNMHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PNMHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPNMHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_XPMHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_XPMHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxXPMHandler *result;
     char *kwnames[] = {
@@ -11778,14 +11962,14 @@ static PyObject *_wrap_new_XPMHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * XPMHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * XPMHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxXPMHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TIFFHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TIFFHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTIFFHandler *result;
     char *kwnames[] = {
@@ -11807,14 +11991,14 @@ static PyObject *_wrap_new_TIFFHandler(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * TIFFHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TIFFHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTIFFHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Quantize_Quantize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Quantize_Quantize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = 0 ;
     wxImage *arg2 = 0 ;
@@ -11845,11 +12029,11 @@ static PyObject *_wrap_Quantize_Quantize(PyObject *self, PyObject *args, PyObjec
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11868,14 +12052,14 @@ static PyObject *_wrap_Quantize_Quantize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * Quantize_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Quantize_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxQuantize, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EvtHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *result;
     char *kwnames[] = {
@@ -11897,7 +12081,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_EvtHandler_GetNextHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_GetNextHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *result;
@@ -11925,7 +12109,7 @@ static PyObject *_wrap_EvtHandler_GetNextHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_EvtHandler_GetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_GetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *result;
@@ -11953,7 +12137,7 @@ static PyObject *_wrap_EvtHandler_GetPreviousHandler(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_EvtHandler_SetNextHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_SetNextHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -11982,7 +12166,7 @@ static PyObject *_wrap_EvtHandler_SetNextHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_EvtHandler_SetPreviousHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_SetPreviousHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -12011,7 +12195,7 @@ static PyObject *_wrap_EvtHandler_SetPreviousHandler(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     bool result;
@@ -12039,7 +12223,7 @@ static PyObject *_wrap_EvtHandler_GetEvtHandlerEnabled(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     bool arg2 ;
@@ -12052,7 +12236,7 @@ static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EvtHandler_SetEvtHandlerEnabled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12068,7 +12252,7 @@ static PyObject *_wrap_EvtHandler_SetEvtHandlerEnabled(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvent *arg2 = 0 ;
@@ -12105,7 +12289,7 @@ static PyObject *_wrap_EvtHandler_ProcessEvent(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_EvtHandler_AddPendingEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_AddPendingEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvent *arg2 = 0 ;
@@ -12139,7 +12323,7 @@ static PyObject *_wrap_EvtHandler_AddPendingEvent(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_EvtHandler_ProcessPendingEvents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_ProcessPendingEvents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12164,7 +12348,7 @@ static PyObject *_wrap_EvtHandler_ProcessPendingEvents(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_EvtHandler_Connect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_Connect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     int arg2 ;
@@ -12183,11 +12367,11 @@ static PyObject *_wrap_EvtHandler_Connect(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:EvtHandler_Connect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     arg5 = obj4;
     {
@@ -12204,7 +12388,7 @@ static PyObject *_wrap_EvtHandler_Connect(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler_Disconnect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     int arg2 ;
@@ -12222,14 +12406,14 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:EvtHandler_Disconnect",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (wxEventType) SWIG_AsInt(obj3); 
+        arg4 = (wxEventType)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12248,7 +12432,7 @@ static PyObject *_wrap_EvtHandler_Disconnect(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_EvtHandler__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EvtHandler__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -12276,14 +12460,14 @@ static PyObject *_wrap_EvtHandler__setOORInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * EvtHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * EvtHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEvtHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_NewEventType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NewEventType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType result;
     char *kwnames[] = {
@@ -12298,14 +12482,14 @@ static PyObject *_wrap_NewEventType(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_delete_Event(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Event(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12330,7 +12514,7 @@ static PyObject *_wrap_delete_Event(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Event_SetEventType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetEventType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxEventType arg2 ;
@@ -12343,7 +12527,7 @@ static PyObject *_wrap_Event_SetEventType(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetEventType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12359,7 +12543,7 @@ static PyObject *_wrap_Event_SetEventType(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Event_GetEventType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetEventType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxEventType result;
@@ -12378,14 +12562,14 @@ static PyObject *_wrap_Event_GetEventType(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Event_GetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetEventObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxObject *result;
@@ -12413,7 +12597,7 @@ static PyObject *_wrap_Event_GetEventObject(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Event_SetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetEventObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxObject *arg2 = (wxObject *) 0 ;
@@ -12442,7 +12626,7 @@ static PyObject *_wrap_Event_SetEventObject(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Event_GetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     long result;
@@ -12461,14 +12645,14 @@ static PyObject *_wrap_Event_GetTimestamp(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Event_SetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     long arg2 = (long) 0 ;
@@ -12482,7 +12666,7 @@ static PyObject *_wrap_Event_SetTimestamp(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12499,7 +12683,7 @@ static PyObject *_wrap_Event_SetTimestamp(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Event_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int result;
@@ -12518,14 +12702,14 @@ static PyObject *_wrap_Event_GetId(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Event_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int arg2 ;
@@ -12538,7 +12722,7 @@ static PyObject *_wrap_Event_SetId(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_SetId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12554,7 +12738,7 @@ static PyObject *_wrap_Event_SetId(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_IsCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool result;
@@ -12582,7 +12766,7 @@ static PyObject *_wrap_Event_IsCommandEvent(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_Skip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool arg2 = (bool) True ;
@@ -12596,7 +12780,7 @@ static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12613,7 +12797,7 @@ static PyObject *_wrap_Event_Skip(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_GetSkipped(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool result;
@@ -12641,7 +12825,7 @@ static PyObject *_wrap_Event_GetSkipped(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_ShouldPropagate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     bool result;
@@ -12669,7 +12853,7 @@ static PyObject *_wrap_Event_ShouldPropagate(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Event_StopPropagation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_StopPropagation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int result;
@@ -12688,14 +12872,14 @@ static PyObject *_wrap_Event_StopPropagation(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Event_ResumePropagation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_ResumePropagation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     int arg2 ;
@@ -12708,7 +12892,7 @@ static PyObject *_wrap_Event_ResumePropagation(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Event_ResumePropagation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12724,7 +12908,7 @@ static PyObject *_wrap_Event_ResumePropagation(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Event_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Event_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = (wxEvent *) 0 ;
     wxEvent *result;
@@ -12750,14 +12934,14 @@ static PyObject *_wrap_Event_Clone(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject * Event_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Event_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PropagationDisabler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PropagationDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = 0 ;
     wxPropagationDisabler *result;
@@ -12788,7 +12972,7 @@ static PyObject *_wrap_new_PropagationDisabler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_delete_PropagationDisabler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PropagationDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPropagationDisabler *arg1 = (wxPropagationDisabler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12813,14 +12997,14 @@ static PyObject *_wrap_delete_PropagationDisabler(PyObject *self, PyObject *args
 }
 
 
-static PyObject * PropagationDisabler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PropagationDisabler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPropagationDisabler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PropagateOnce(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PropagateOnce(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvent *arg1 = 0 ;
     wxPropagateOnce *result;
@@ -12851,7 +13035,7 @@ static PyObject *_wrap_new_PropagateOnce(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_delete_PropagateOnce(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PropagateOnce(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPropagateOnce *arg1 = (wxPropagateOnce *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12876,14 +13060,14 @@ static PyObject *_wrap_delete_PropagateOnce(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * PropagateOnce_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PropagateOnce_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPropagateOnce, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -12896,11 +13080,11 @@ static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CommandEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12917,7 +13101,7 @@ static PyObject *_wrap_new_CommandEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_CommandEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     int result;
@@ -12936,14 +13120,14 @@ static PyObject *_wrap_CommandEvent_GetSelection(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -12984,7 +13168,7 @@ static PyObject *_wrap_CommandEvent_SetString(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_CommandEvent_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxString result;
@@ -13016,7 +13200,7 @@ static PyObject *_wrap_CommandEvent_GetString(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     bool result;
@@ -13044,7 +13228,7 @@ static PyObject *_wrap_CommandEvent_IsChecked(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_IsSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     bool result;
@@ -13072,7 +13256,7 @@ static PyObject *_wrap_CommandEvent_IsSelection(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     long arg2 ;
@@ -13085,7 +13269,7 @@ static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetExtraLong",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13101,7 +13285,7 @@ static PyObject *_wrap_CommandEvent_SetExtraLong(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     long result;
@@ -13120,14 +13304,14 @@ static PyObject *_wrap_CommandEvent_GetExtraLong(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CommandEvent_SetInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_SetInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     int arg2 ;
@@ -13140,7 +13324,7 @@ static PyObject *_wrap_CommandEvent_SetInt(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CommandEvent_SetInt",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCommandEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13156,7 +13340,7 @@ static PyObject *_wrap_CommandEvent_SetInt(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_CommandEvent_GetInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_GetInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     long result;
@@ -13175,14 +13359,14 @@ static PyObject *_wrap_CommandEvent_GetInt(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CommandEvent_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CommandEvent_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
     wxEvent *result;
@@ -13208,14 +13392,14 @@ static PyObject *_wrap_CommandEvent_Clone(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * CommandEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CommandEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCommandEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NotifyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -13228,11 +13412,11 @@ static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_NotifyEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13249,7 +13433,7 @@ static PyObject *_wrap_new_NotifyEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_NotifyEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotifyEvent_Veto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotifyEvent *arg1 = (wxNotifyEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13274,7 +13458,7 @@ static PyObject *_wrap_NotifyEvent_Veto(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_NotifyEvent_Allow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotifyEvent_Allow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotifyEvent *arg1 = (wxNotifyEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13299,7 +13483,7 @@ static PyObject *_wrap_NotifyEvent_Allow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNotifyEvent *arg1 = (wxNotifyEvent *) 0 ;
     bool result;
@@ -13327,14 +13511,14 @@ static PyObject *_wrap_NotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * NotifyEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NotifyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNotifyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScrollEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -13351,19 +13535,19 @@ static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_ScrollEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13380,7 +13564,7 @@ static PyObject *_wrap_new_ScrollEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int result;
@@ -13399,14 +13583,14 @@ static PyObject *_wrap_ScrollEvent_GetOrientation(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int result;
@@ -13425,14 +13609,14 @@ static PyObject *_wrap_ScrollEvent_GetPosition(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int arg2 ;
@@ -13445,7 +13629,7 @@ static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13461,7 +13645,7 @@ static PyObject *_wrap_ScrollEvent_SetOrientation(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollEvent *arg1 = (wxScrollEvent *) 0 ;
     int arg2 ;
@@ -13474,7 +13658,7 @@ static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13490,14 +13674,14 @@ static PyObject *_wrap_ScrollEvent_SetPosition(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * ScrollEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ScrollEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScrollEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScrollWinEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -13512,15 +13696,15 @@ static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ScrollWinEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13537,7 +13721,7 @@ static PyObject *_wrap_new_ScrollWinEvent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int result;
@@ -13556,14 +13740,14 @@ static PyObject *_wrap_ScrollWinEvent_GetOrientation(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int result;
@@ -13582,14 +13766,14 @@ static PyObject *_wrap_ScrollWinEvent_GetPosition(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int arg2 ;
@@ -13602,7 +13786,7 @@ static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollWinEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13618,7 +13802,7 @@ static PyObject *_wrap_ScrollWinEvent_SetOrientation(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrollWinEvent *arg1 = (wxScrollWinEvent *) 0 ;
     int arg2 ;
@@ -13631,7 +13815,7 @@ static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrollWinEvent_SetPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrollWinEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13647,14 +13831,14 @@ static PyObject *_wrap_ScrollWinEvent_SetPosition(PyObject *self, PyObject *args
 }
 
 
-static PyObject * ScrollWinEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ScrollWinEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScrollWinEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MouseEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MouseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     wxMouseEvent *result;
@@ -13665,7 +13849,7 @@ static PyObject *_wrap_new_MouseEvent(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MouseEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13684,7 +13868,7 @@ static PyObject *_wrap_new_MouseEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_IsButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -13712,7 +13896,7 @@ static PyObject *_wrap_MouseEvent_IsButton(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 = (int) wxMOUSE_BTN_ANY ;
@@ -13727,7 +13911,7 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13746,7 +13930,7 @@ static PyObject *_wrap_MouseEvent_ButtonDown(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 = (int) wxMOUSE_BTN_ANY ;
@@ -13761,7 +13945,7 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13780,7 +13964,7 @@ static PyObject *_wrap_MouseEvent_ButtonDClick(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 = (int) wxMOUSE_BTN_ANY ;
@@ -13795,7 +13979,7 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13814,7 +13998,7 @@ static PyObject *_wrap_MouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Button(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -13828,7 +14012,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13846,7 +14030,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -13860,7 +14044,7 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_ButtonIsDown",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13878,7 +14062,7 @@ static PyObject *_wrap_MouseEvent_ButtonIsDown(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_MouseEvent_GetButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -13897,14 +14081,14 @@ static PyObject *_wrap_MouseEvent_GetButton(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -13932,7 +14116,7 @@ static PyObject *_wrap_MouseEvent_ControlDown(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -13960,7 +14144,7 @@ static PyObject *_wrap_MouseEvent_MetaDown(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -13988,7 +14172,7 @@ static PyObject *_wrap_MouseEvent_AltDown(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14016,7 +14200,7 @@ static PyObject *_wrap_MouseEvent_ShiftDown(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MouseEvent_CmdDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_CmdDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14044,7 +14228,7 @@ static PyObject *_wrap_MouseEvent_CmdDown(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14072,7 +14256,7 @@ static PyObject *_wrap_MouseEvent_LeftDown(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14100,7 +14284,7 @@ static PyObject *_wrap_MouseEvent_MiddleDown(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14128,7 +14312,7 @@ static PyObject *_wrap_MouseEvent_RightDown(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14156,7 +14340,7 @@ static PyObject *_wrap_MouseEvent_LeftUp(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14184,7 +14368,7 @@ static PyObject *_wrap_MouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14212,7 +14396,7 @@ static PyObject *_wrap_MouseEvent_RightUp(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14240,7 +14424,7 @@ static PyObject *_wrap_MouseEvent_LeftDClick(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14268,7 +14452,7 @@ static PyObject *_wrap_MouseEvent_MiddleDClick(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightDClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14296,7 +14480,7 @@ static PyObject *_wrap_MouseEvent_RightDClick(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14324,7 +14508,7 @@ static PyObject *_wrap_MouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14352,7 +14536,7 @@ static PyObject *_wrap_MouseEvent_MiddleIsDown(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14380,7 +14564,7 @@ static PyObject *_wrap_MouseEvent_RightIsDown(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Dragging(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14408,7 +14592,7 @@ static PyObject *_wrap_MouseEvent_Dragging(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Moving(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14436,7 +14620,7 @@ static PyObject *_wrap_MouseEvent_Moving(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Entering(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14464,7 +14648,7 @@ static PyObject *_wrap_MouseEvent_Entering(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_Leaving(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14492,7 +14676,7 @@ static PyObject *_wrap_MouseEvent_Leaving(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MouseEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     wxPoint result;
@@ -14522,20 +14706,22 @@ static PyObject *_wrap_MouseEvent_GetPosition(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MouseEvent_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     long *arg2 = (long *) 0 ;
     long *arg3 = (long *) 0 ;
     long temp2 ;
+    int res2 = 0 ;
     long temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MouseEvent_GetPositionTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -14547,21 +14733,17 @@ static PyObject *_wrap_MouseEvent_GetPositionTuple(PyObject *self, PyObject *arg
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     wxDC *arg2 = 0 ;
@@ -14600,7 +14782,7 @@ static PyObject *_wrap_MouseEvent_GetLogicalPosition(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14619,14 +14801,14 @@ static PyObject *_wrap_MouseEvent_GetX(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14645,14 +14827,14 @@ static PyObject *_wrap_MouseEvent_GetY(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14671,14 +14853,14 @@ static PyObject *_wrap_MouseEvent_GetWheelRotation(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14697,14 +14879,14 @@ static PyObject *_wrap_MouseEvent_GetWheelDelta(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14723,14 +14905,14 @@ static PyObject *_wrap_MouseEvent_GetLinesPerAction(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14758,7 +14940,7 @@ static PyObject *_wrap_MouseEvent_IsPageScroll(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -14771,7 +14953,7 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_x = arg2;
     
@@ -14782,7 +14964,7 @@ static PyObject *_wrap_MouseEvent_m_x_set(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14796,14 +14978,14 @@ static PyObject *_wrap_MouseEvent_m_x_get(PyObject *self, PyObject *args, PyObje
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_x);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -14816,7 +14998,7 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_y = arg2;
     
@@ -14827,7 +15009,7 @@ static PyObject *_wrap_MouseEvent_m_y_set(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -14841,14 +15023,14 @@ static PyObject *_wrap_MouseEvent_m_y_get(PyObject *self, PyObject *args, PyObje
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_y);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -14861,7 +15043,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_leftDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_leftDown = arg2;
     
@@ -14872,7 +15054,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14895,7 +15077,7 @@ static PyObject *_wrap_MouseEvent_m_leftDown_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -14908,7 +15090,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_middleDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_middleDown = arg2;
     
@@ -14919,7 +15101,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_set(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14942,7 +15124,7 @@ static PyObject *_wrap_MouseEvent_m_middleDown_get(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -14955,7 +15137,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_rightDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_rightDown = arg2;
     
@@ -14966,7 +15148,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_set(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -14989,7 +15171,7 @@ static PyObject *_wrap_MouseEvent_m_rightDown_get(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -15002,7 +15184,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_controlDown = arg2;
     
@@ -15013,7 +15195,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_set(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -15036,7 +15218,7 @@ static PyObject *_wrap_MouseEvent_m_controlDown_get(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -15049,7 +15231,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_shiftDown = arg2;
     
@@ -15060,7 +15242,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_set(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -15083,7 +15265,7 @@ static PyObject *_wrap_MouseEvent_m_shiftDown_get(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -15096,7 +15278,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_altDown = arg2;
     
@@ -15107,7 +15289,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -15130,7 +15312,7 @@ static PyObject *_wrap_MouseEvent_m_altDown_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool arg2 ;
@@ -15143,7 +15325,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_metaDown = arg2;
     
@@ -15154,7 +15336,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     bool result;
@@ -15177,7 +15359,7 @@ static PyObject *_wrap_MouseEvent_m_metaDown_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -15190,7 +15372,7 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelRotation_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_wheelRotation = arg2;
     
@@ -15201,7 +15383,7 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_set(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -15215,14 +15397,14 @@ static PyObject *_wrap_MouseEvent_m_wheelRotation_get(PyObject *self, PyObject *
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_wheelRotation);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -15235,7 +15417,7 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_wheelDelta_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_wheelDelta = arg2;
     
@@ -15246,7 +15428,7 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_set(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -15260,14 +15442,14 @@ static PyObject *_wrap_MouseEvent_m_wheelDelta_get(PyObject *self, PyObject *arg
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_wheelDelta);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int arg2 ;
@@ -15280,7 +15462,7 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_m_linesPerAction_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_linesPerAction = arg2;
     
@@ -15291,7 +15473,7 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_set(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseEvent *arg1 = (wxMouseEvent *) 0 ;
     int result;
@@ -15305,21 +15487,21 @@ static PyObject *_wrap_MouseEvent_m_linesPerAction_get(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_linesPerAction);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * MouseEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MouseEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMouseEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SetCursorEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -15332,11 +15514,11 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SetCursorEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15353,7 +15535,7 @@ static PyObject *_wrap_new_SetCursorEvent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     int result;
@@ -15372,14 +15554,14 @@ static PyObject *_wrap_SetCursorEvent_GetX(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     int result;
@@ -15398,14 +15580,14 @@ static PyObject *_wrap_SetCursorEvent_GetY(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SetCursorEvent_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     wxCursor *arg2 = 0 ;
@@ -15439,7 +15621,7 @@ static PyObject *_wrap_SetCursorEvent_SetCursor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     wxCursor *result;
@@ -15471,7 +15653,7 @@ static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSetCursorEvent *arg1 = (wxSetCursorEvent *) 0 ;
     bool result;
@@ -15499,14 +15681,14 @@ static PyObject *_wrap_SetCursorEvent_HasCursor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * SetCursorEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SetCursorEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSetCursorEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_KeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     wxKeyEvent *result;
@@ -15517,7 +15699,7 @@ static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kw
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15534,7 +15716,7 @@ static PyObject *_wrap_new_KeyEvent(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -15562,7 +15744,7 @@ static PyObject *_wrap_KeyEvent_ControlDown(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -15590,7 +15772,7 @@ static PyObject *_wrap_KeyEvent_MetaDown(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -15618,7 +15800,7 @@ static PyObject *_wrap_KeyEvent_AltDown(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -15646,7 +15828,7 @@ static PyObject *_wrap_KeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_KeyEvent_CmdDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_CmdDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -15674,7 +15856,7 @@ static PyObject *_wrap_KeyEvent_CmdDown(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -15702,7 +15884,7 @@ static PyObject *_wrap_KeyEvent_HasModifiers(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -15721,14 +15903,14 @@ static PyObject *_wrap_KeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_GetUnicodeKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetUnicodeKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -15747,14 +15929,14 @@ static PyObject *_wrap_KeyEvent_GetUnicodeKey(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -15773,14 +15955,14 @@ static PyObject *_wrap_KeyEvent_GetRawKeyCode(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -15799,14 +15981,14 @@ static PyObject *_wrap_KeyEvent_GetRawKeyFlags(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     wxPoint result;
@@ -15836,20 +16018,22 @@ static PyObject *_wrap_KeyEvent_GetPosition(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     long *arg2 = (long *) 0 ;
     long *arg3 = (long *) 0 ;
     long temp2 ;
+    int res2 = 0 ;
     long temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:KeyEvent_GetPositionTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15861,21 +16045,17 @@ static PyObject *_wrap_KeyEvent_GetPositionTuple(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_long, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -15894,14 +16074,14 @@ static PyObject *_wrap_KeyEvent_GetX(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -15920,14 +16100,14 @@ static PyObject *_wrap_KeyEvent_GetY(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_x_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int arg2 ;
@@ -15940,7 +16120,7 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_x_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_x = arg2;
     
@@ -15951,7 +16131,7 @@ static PyObject *_wrap_KeyEvent_m_x_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_x_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -15965,14 +16145,14 @@ static PyObject *_wrap_KeyEvent_m_x_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_x);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_y_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int arg2 ;
@@ -15985,7 +16165,7 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_y_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_y = arg2;
     
@@ -15996,7 +16176,7 @@ static PyObject *_wrap_KeyEvent_m_y_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_y_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     int result;
@@ -16010,14 +16190,14 @@ static PyObject *_wrap_KeyEvent_m_y_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_y);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     long arg2 ;
@@ -16030,7 +16210,7 @@ static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_keyCode_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_keyCode = arg2;
     
@@ -16041,7 +16221,7 @@ static PyObject *_wrap_KeyEvent_m_keyCode_set(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     long result;
@@ -16055,14 +16235,14 @@ static PyObject *_wrap_KeyEvent_m_keyCode_get(PyObject *self, PyObject *args, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (long) ((arg1)->m_keyCode);
     
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -16075,7 +16255,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_controlDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_controlDown = arg2;
     
@@ -16086,7 +16266,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_set(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -16109,7 +16289,7 @@ static PyObject *_wrap_KeyEvent_m_controlDown_get(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -16122,7 +16302,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_shiftDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_shiftDown = arg2;
     
@@ -16133,7 +16313,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -16156,7 +16336,7 @@ static PyObject *_wrap_KeyEvent_m_shiftDown_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -16169,7 +16349,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_altDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_altDown = arg2;
     
@@ -16180,7 +16360,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_set(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -16203,7 +16383,7 @@ static PyObject *_wrap_KeyEvent_m_altDown_get(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -16216,7 +16396,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_metaDown_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_metaDown = arg2;
     
@@ -16227,7 +16407,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -16250,7 +16430,7 @@ static PyObject *_wrap_KeyEvent_m_metaDown_get(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool arg2 ;
@@ -16263,7 +16443,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_scanCode_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_scanCode = arg2;
     
@@ -16274,7 +16454,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     bool result;
@@ -16297,7 +16477,7 @@ static PyObject *_wrap_KeyEvent_m_scanCode_get(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int arg2 ;
@@ -16310,7 +16490,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawCode_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_rawCode = arg2;
     
@@ -16321,7 +16501,7 @@ static PyObject *_wrap_KeyEvent_m_rawCode_set(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -16335,14 +16515,14 @@ static PyObject *_wrap_KeyEvent_m_rawCode_get(PyObject *self, PyObject *args, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (unsigned int) ((arg1)->m_rawCode);
     
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int arg2 ;
@@ -16355,7 +16535,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:KeyEvent_m_rawFlags_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_rawFlags = arg2;
     
@@ -16366,7 +16546,7 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxKeyEvent *arg1 = (wxKeyEvent *) 0 ;
     unsigned int result;
@@ -16380,21 +16560,21 @@ static PyObject *_wrap_KeyEvent_m_rawFlags_get(PyObject *self, PyObject *args, P
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (unsigned int) ((arg1)->m_rawFlags);
     
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * KeyEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * KeyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxKeyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize const &arg1_defvalue = wxDefaultSize ;
     wxSize *arg1 = (wxSize *) &arg1_defvalue ;
@@ -16415,7 +16595,7 @@ static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16432,7 +16612,7 @@ static PyObject *_wrap_new_SizeEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_SizeEvent_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize result;
@@ -16462,7 +16642,7 @@ static PyObject *_wrap_SizeEvent_GetSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizeEvent_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect result;
@@ -16492,7 +16672,7 @@ static PyObject *_wrap_SizeEvent_GetRect(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizeEvent_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect arg2 ;
@@ -16523,7 +16703,7 @@ static PyObject *_wrap_SizeEvent_SetRect(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizeEvent_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize arg2 ;
@@ -16554,7 +16734,7 @@ static PyObject *_wrap_SizeEvent_SetSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizeEvent_m_size_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_size_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize *arg2 = (wxSize *) 0 ;
@@ -16578,7 +16758,7 @@ static PyObject *_wrap_SizeEvent_m_size_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SizeEvent_m_size_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_size_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxSize *result;
@@ -16599,7 +16779,7 @@ static PyObject *_wrap_SizeEvent_m_size_get(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SizeEvent_m_rect_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_rect_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect *arg2 = (wxRect *) 0 ;
@@ -16623,7 +16803,7 @@ static PyObject *_wrap_SizeEvent_m_rect_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SizeEvent_m_rect_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizeEvent_m_rect_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizeEvent *arg1 = (wxSizeEvent *) 0 ;
     wxRect *result;
@@ -16644,14 +16824,14 @@ static PyObject *_wrap_SizeEvent_m_rect_get(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * SizeEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MoveEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint const &arg1_defvalue = wxDefaultPosition ;
     wxPoint *arg1 = (wxPoint *) &arg1_defvalue ;
@@ -16672,7 +16852,7 @@ static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16689,7 +16869,7 @@ static PyObject *_wrap_new_MoveEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_MoveEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxPoint result;
@@ -16719,7 +16899,7 @@ static PyObject *_wrap_MoveEvent_GetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MoveEvent_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxRect result;
@@ -16749,7 +16929,7 @@ static PyObject *_wrap_MoveEvent_GetRect(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MoveEvent_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxRect arg2 ;
@@ -16780,7 +16960,7 @@ static PyObject *_wrap_MoveEvent_SetRect(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MoveEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxPoint arg2 ;
@@ -16811,7 +16991,7 @@ static PyObject *_wrap_MoveEvent_SetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MoveEvent_m_pos_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_m_pos_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxPoint *arg2 = (wxPoint *) 0 ;
@@ -16835,7 +17015,7 @@ static PyObject *_wrap_MoveEvent_m_pos_set(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MoveEvent_m_pos_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_m_pos_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxPoint *result;
@@ -16856,7 +17036,7 @@ static PyObject *_wrap_MoveEvent_m_pos_get(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MoveEvent_m_rect_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_m_rect_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxRect *arg2 = (wxRect *) 0 ;
@@ -16880,7 +17060,7 @@ static PyObject *_wrap_MoveEvent_m_rect_set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MoveEvent_m_rect_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MoveEvent_m_rect_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
     wxRect *result;
@@ -16901,14 +17081,14 @@ static PyObject *_wrap_MoveEvent_m_rect_get(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * MoveEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MoveEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMoveEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PaintEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxPaintEvent *result;
@@ -16919,7 +17099,7 @@ static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaintEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16936,14 +17116,14 @@ static PyObject *_wrap_new_PaintEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * PaintEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PaintEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPaintEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NcPaintEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxNcPaintEvent *result;
@@ -16954,7 +17134,7 @@ static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_NcPaintEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16971,14 +17151,14 @@ static PyObject *_wrap_new_NcPaintEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * NcPaintEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NcPaintEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNcPaintEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EraseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxDC *arg2 = (wxDC *) (wxDC *) NULL ;
@@ -16991,7 +17171,7 @@ static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_EraseEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
@@ -17012,7 +17192,7 @@ static PyObject *_wrap_new_EraseEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_EraseEvent_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EraseEvent_GetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEraseEvent *arg1 = (wxEraseEvent *) 0 ;
     wxDC *result;
@@ -17040,14 +17220,14 @@ static PyObject *_wrap_EraseEvent_GetDC(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * EraseEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * EraseEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEraseEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FocusEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -17060,11 +17240,11 @@ static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FocusEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17081,7 +17261,7 @@ static PyObject *_wrap_new_FocusEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_FocusEvent_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FocusEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFocusEvent *arg1 = (wxFocusEvent *) 0 ;
     wxWindow *result;
@@ -17109,7 +17289,7 @@ static PyObject *_wrap_FocusEvent_GetWindow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FocusEvent_SetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FocusEvent_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFocusEvent *arg1 = (wxFocusEvent *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -17138,14 +17318,14 @@ static PyObject *_wrap_FocusEvent_SetWindow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * FocusEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FocusEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFocusEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ChildFocusEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ChildFocusEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxChildFocusEvent *result;
@@ -17173,7 +17353,7 @@ static PyObject *_wrap_new_ChildFocusEvent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChildFocusEvent *arg1 = (wxChildFocusEvent *) 0 ;
     wxWindow *result;
@@ -17201,14 +17381,14 @@ static PyObject *_wrap_ChildFocusEvent_GetWindow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * ChildFocusEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ChildFocusEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxChildFocusEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ActivateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     bool arg2 = (bool) True ;
@@ -17223,15 +17403,15 @@ static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ActivateEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17248,7 +17428,7 @@ static PyObject *_wrap_new_ActivateEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ActivateEvent_GetActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxActivateEvent *arg1 = (wxActivateEvent *) 0 ;
     bool result;
@@ -17276,14 +17456,14 @@ static PyObject *_wrap_ActivateEvent_GetActive(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * ActivateEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ActivateEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxActivateEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_InitDialogEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxInitDialogEvent *result;
@@ -17294,7 +17474,7 @@ static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_InitDialogEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17311,14 +17491,14 @@ static PyObject *_wrap_new_InitDialogEvent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * InitDialogEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * InitDialogEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxInitDialogEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MenuEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -17333,11 +17513,11 @@ static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_MenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -17358,7 +17538,7 @@ static PyObject *_wrap_new_MenuEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuEvent *arg1 = (wxMenuEvent *) 0 ;
     int result;
@@ -17377,14 +17557,14 @@ static PyObject *_wrap_MenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuEvent_IsPopup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuEvent *arg1 = (wxMenuEvent *) 0 ;
     bool result;
@@ -17412,7 +17592,7 @@ static PyObject *_wrap_MenuEvent_IsPopup(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuEvent_GetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuEvent_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuEvent *arg1 = (wxMenuEvent *) 0 ;
     wxMenu *result;
@@ -17440,14 +17620,14 @@ static PyObject *_wrap_MenuEvent_GetMenu(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * MenuEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MenuEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenuEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CloseEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -17460,11 +17640,11 @@ static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_CloseEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17481,7 +17661,7 @@ static PyObject *_wrap_new_CloseEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool arg2 ;
@@ -17494,7 +17674,7 @@ static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetLoggingOff",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17510,7 +17690,7 @@ static PyObject *_wrap_CloseEvent_SetLoggingOff(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool result;
@@ -17538,7 +17718,7 @@ static PyObject *_wrap_CloseEvent_GetLoggingOff(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_Veto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool arg2 = (bool) True ;
@@ -17552,7 +17732,7 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17569,7 +17749,7 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool arg2 ;
@@ -17582,7 +17762,7 @@ static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCloseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17598,7 +17778,7 @@ static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool result;
@@ -17626,7 +17806,7 @@ static PyObject *_wrap_CloseEvent_CanVeto(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCloseEvent *arg1 = (wxCloseEvent *) 0 ;
     bool result;
@@ -17654,14 +17834,14 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * CloseEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CloseEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCloseEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ShowEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     bool arg2 = (bool) False ;
@@ -17674,11 +17854,11 @@ static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_ShowEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17695,7 +17875,7 @@ static PyObject *_wrap_new_ShowEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_ShowEvent_SetShow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShowEvent_SetShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShowEvent *arg1 = (wxShowEvent *) 0 ;
     bool arg2 ;
@@ -17708,7 +17888,7 @@ static PyObject *_wrap_ShowEvent_SetShow(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ShowEvent_SetShow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxShowEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17724,7 +17904,7 @@ static PyObject *_wrap_ShowEvent_SetShow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShowEvent_GetShow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxShowEvent *arg1 = (wxShowEvent *) 0 ;
     bool result;
@@ -17752,14 +17932,14 @@ static PyObject *_wrap_ShowEvent_GetShow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * ShowEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ShowEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxShowEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     bool arg2 = (bool) True ;
@@ -17772,11 +17952,11 @@ static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_IconizeEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17793,7 +17973,7 @@ static PyObject *_wrap_new_IconizeEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconizeEvent_Iconized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconizeEvent *arg1 = (wxIconizeEvent *) 0 ;
     bool result;
@@ -17821,14 +18001,14 @@ static PyObject *_wrap_IconizeEvent_Iconized(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * IconizeEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * IconizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIconizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MaximizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxMaximizeEvent *result;
@@ -17839,7 +18019,7 @@ static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MaximizeEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17856,14 +18036,14 @@ static PyObject *_wrap_new_MaximizeEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * MaximizeEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MaximizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMaximizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_DropFilesEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropFilesEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDropFilesEvent *arg1 = (wxDropFilesEvent *) 0 ;
     wxPoint result;
@@ -17893,7 +18073,7 @@ static PyObject *_wrap_DropFilesEvent_GetPosition(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDropFilesEvent *arg1 = (wxDropFilesEvent *) 0 ;
     int result;
@@ -17912,14 +18092,14 @@ static PyObject *_wrap_DropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DropFilesEvent_GetFiles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropFilesEvent_GetFiles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDropFilesEvent *arg1 = (wxDropFilesEvent *) 0 ;
     PyObject *result;
@@ -17945,14 +18125,14 @@ static PyObject *_wrap_DropFilesEvent_GetFiles(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * DropFilesEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DropFilesEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDropFilesEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_UpdateUIEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxUpdateUIEvent *result;
@@ -17963,7 +18143,7 @@ static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_UpdateUIEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17980,7 +18160,7 @@ static PyObject *_wrap_new_UpdateUIEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -18008,7 +18188,7 @@ static PyObject *_wrap_UpdateUIEvent_GetChecked(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -18036,7 +18216,7 @@ static PyObject *_wrap_UpdateUIEvent_GetEnabled(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     wxString result;
@@ -18068,7 +18248,7 @@ static PyObject *_wrap_UpdateUIEvent_GetText(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -18096,7 +18276,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -18124,7 +18304,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetChecked(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool result;
@@ -18152,7 +18332,7 @@ static PyObject *_wrap_UpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool arg2 ;
@@ -18165,7 +18345,7 @@ static PyObject *_wrap_UpdateUIEvent_Check(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Check",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18181,7 +18361,7 @@ static PyObject *_wrap_UpdateUIEvent_Check(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     bool arg2 ;
@@ -18194,7 +18374,7 @@ static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:UpdateUIEvent_Enable",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxUpdateUIEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18210,7 +18390,7 @@ static PyObject *_wrap_UpdateUIEvent_Enable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxUpdateUIEvent *arg1 = (wxUpdateUIEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -18251,7 +18431,7 @@ static PyObject *_wrap_UpdateUIEvent_SetText(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -18260,7 +18440,7 @@ static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetUpdateInterval",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18276,7 +18456,7 @@ static PyObject *_wrap_UpdateUIEvent_SetUpdateInterval(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -18291,14 +18471,14 @@ static PyObject *_wrap_UpdateUIEvent_GetUpdateInterval(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -18326,7 +18506,7 @@ static PyObject *_wrap_UpdateUIEvent_CanUpdate(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -18347,7 +18527,7 @@ static PyObject *_wrap_UpdateUIEvent_ResetUpdateTime(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -18356,7 +18536,7 @@ static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:UpdateUIEvent_SetMode",kwnames,&obj0)) goto fail;
-    arg1 = (wxUpdateUIMode) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18372,7 +18552,7 @@ static PyObject *_wrap_UpdateUIEvent_SetMode(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -18387,21 +18567,21 @@ static PyObject *_wrap_UpdateUIEvent_GetMode(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * UpdateUIEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * UpdateUIEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxUpdateUIEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SysColourChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SysColourChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSysColourChangedEvent *result;
     char *kwnames[] = {
@@ -18423,14 +18603,14 @@ static PyObject *_wrap_new_SysColourChangedEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * SysColourChangedEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SysColourChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSysColourChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -18443,7 +18623,7 @@ static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *ar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_MouseCaptureChangedEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
@@ -18464,7 +18644,7 @@ static PyObject *_wrap_new_MouseCaptureChangedEvent(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMouseCaptureChangedEvent *arg1 = (wxMouseCaptureChangedEvent *) 0 ;
     wxWindow *result;
@@ -18492,14 +18672,14 @@ static PyObject *_wrap_MouseCaptureChangedEvent_GetCapturedWindow(PyObject *self
 }
 
 
-static PyObject * MouseCaptureChangedEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MouseCaptureChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMouseCaptureChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DisplayChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DisplayChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplayChangedEvent *result;
     char *kwnames[] = {
@@ -18521,14 +18701,14 @@ static PyObject *_wrap_new_DisplayChangedEvent(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * DisplayChangedEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DisplayChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDisplayChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PaletteChangedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxPaletteChangedEvent *result;
@@ -18539,7 +18719,7 @@ static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, P
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_PaletteChangedEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18556,7 +18736,7 @@ static PyObject *_wrap_new_PaletteChangedEvent(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PaletteChangedEvent_SetChangedWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PaletteChangedEvent_SetChangedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPaletteChangedEvent *arg1 = (wxPaletteChangedEvent *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -18585,7 +18765,7 @@ static PyObject *_wrap_PaletteChangedEvent_SetChangedWindow(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPaletteChangedEvent *arg1 = (wxPaletteChangedEvent *) 0 ;
     wxWindow *result;
@@ -18613,14 +18793,14 @@ static PyObject *_wrap_PaletteChangedEvent_GetChangedWindow(PyObject *self, PyOb
 }
 
 
-static PyObject * PaletteChangedEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PaletteChangedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPaletteChangedEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxQueryNewPaletteEvent *result;
@@ -18631,7 +18811,7 @@ static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryNewPaletteEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18648,7 +18828,7 @@ static PyObject *_wrap_new_QueryNewPaletteEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryNewPaletteEvent *arg1 = (wxQueryNewPaletteEvent *) 0 ;
     bool arg2 ;
@@ -18661,7 +18841,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryNewPaletteEvent_SetPaletteRealized",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryNewPaletteEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18677,7 +18857,7 @@ static PyObject *_wrap_QueryNewPaletteEvent_SetPaletteRealized(PyObject *self, P
 }
 
 
-static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryNewPaletteEvent *arg1 = (wxQueryNewPaletteEvent *) 0 ;
     bool result;
@@ -18705,14 +18885,14 @@ static PyObject *_wrap_QueryNewPaletteEvent_GetPaletteRealized(PyObject *self, P
 }
 
 
-static PyObject * QueryNewPaletteEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * QueryNewPaletteEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxQueryNewPaletteEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_NavigationKeyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NavigationKeyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *result;
     char *kwnames[] = {
@@ -18734,7 +18914,7 @@ static PyObject *_wrap_new_NavigationKeyEvent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool result;
@@ -18762,7 +18942,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetDirection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool arg2 ;
@@ -18775,7 +18955,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetDirection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18791,7 +18971,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetDirection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool result;
@@ -18819,7 +18999,7 @@ static PyObject *_wrap_NavigationKeyEvent_IsWindowChange(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     bool arg2 ;
@@ -18832,7 +19012,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetWindowChange",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18848,7 +19028,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetWindowChange(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     long arg2 ;
@@ -18861,7 +19041,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:NavigationKeyEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNavigationKeyEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18877,7 +19057,7 @@ static PyObject *_wrap_NavigationKeyEvent_SetFlags(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     wxWindow *result;
@@ -18905,7 +19085,7 @@ static PyObject *_wrap_NavigationKeyEvent_GetCurrentFocus(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_NavigationKeyEvent_SetCurrentFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NavigationKeyEvent_SetCurrentFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNavigationKeyEvent *arg1 = (wxNavigationKeyEvent *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -18934,14 +19114,14 @@ static PyObject *_wrap_NavigationKeyEvent_SetCurrentFocus(PyObject *self, PyObje
 }
 
 
-static PyObject * NavigationKeyEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NavigationKeyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNavigationKeyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_WindowCreateEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WindowCreateEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxWindowCreateEvent *result;
@@ -18969,7 +19149,7 @@ static PyObject *_wrap_new_WindowCreateEvent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowCreateEvent *arg1 = (wxWindowCreateEvent *) 0 ;
     wxWindow *result;
@@ -18997,14 +19177,14 @@ static PyObject *_wrap_WindowCreateEvent_GetWindow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * WindowCreateEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WindowCreateEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindowCreateEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_WindowDestroyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WindowDestroyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxWindowDestroyEvent *result;
@@ -19032,7 +19212,7 @@ static PyObject *_wrap_new_WindowDestroyEvent(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowDestroyEvent *arg1 = (wxWindowDestroyEvent *) 0 ;
     wxWindow *result;
@@ -19060,14 +19240,14 @@ static PyObject *_wrap_WindowDestroyEvent_GetWindow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * WindowDestroyEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WindowDestroyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindowDestroyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ContextMenuEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -19084,11 +19264,11 @@ static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ContextMenuEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -19111,7 +19291,7 @@ static PyObject *_wrap_new_ContextMenuEvent(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ContextMenuEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ContextMenuEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextMenuEvent *arg1 = (wxContextMenuEvent *) 0 ;
     wxPoint *result;
@@ -19140,7 +19320,7 @@ static PyObject *_wrap_ContextMenuEvent_GetPosition(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ContextMenuEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ContextMenuEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxContextMenuEvent *arg1 = (wxContextMenuEvent *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -19172,14 +19352,14 @@ static PyObject *_wrap_ContextMenuEvent_SetPosition(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * ContextMenuEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ContextMenuEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxContextMenuEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_IdleEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IdleEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *result;
     char *kwnames[] = {
@@ -19201,7 +19381,7 @@ static PyObject *_wrap_new_IdleEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_RequestMore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *arg1 = (wxIdleEvent *) 0 ;
     bool arg2 = (bool) True ;
@@ -19215,7 +19395,7 @@ static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIdleEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19232,7 +19412,7 @@ static PyObject *_wrap_IdleEvent_RequestMore(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIdleEvent *arg1 = (wxIdleEvent *) 0 ;
     bool result;
@@ -19260,7 +19440,7 @@ static PyObject *_wrap_IdleEvent_MoreRequested(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_IdleEvent_SetMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_SetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -19269,7 +19449,7 @@ static PyObject *_wrap_IdleEvent_SetMode(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IdleEvent_SetMode",kwnames,&obj0)) goto fail;
-    arg1 = (wxIdleMode) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19285,7 +19465,7 @@ static PyObject *_wrap_IdleEvent_SetMode(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_IdleEvent_GetMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_GetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -19300,14 +19480,14 @@ static PyObject *_wrap_IdleEvent_GetMode(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IdleEvent_CanSend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -19335,14 +19515,14 @@ static PyObject *_wrap_IdleEvent_CanSend(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * IdleEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * IdleEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIdleEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxEventType arg2 = (wxEventType) wxEVT_NULL ;
@@ -19355,11 +19535,11 @@ static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwa
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxEventType) SWIG_AsInt(obj1); 
+        arg2 = (wxEventType)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19376,7 +19556,7 @@ static PyObject *_wrap_new_PyEvent(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_PyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PyEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEvent *arg1 = (wxPyEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19401,7 +19581,7 @@ static PyObject *_wrap_delete_PyEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyEvent_SetSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEvent *arg1 = (wxPyEvent *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -19429,7 +19609,7 @@ static PyObject *_wrap_PyEvent_SetSelf(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyEvent_GetSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyEvent *arg1 = (wxPyEvent *) 0 ;
     PyObject *result;
@@ -19455,14 +19635,14 @@ static PyObject *_wrap_PyEvent_GetSelf(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * PyEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -19475,11 +19655,11 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19496,7 +19676,7 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_PyCommandEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PyCommandEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19521,7 +19701,7 @@ static PyObject *_wrap_delete_PyCommandEvent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -19549,7 +19729,7 @@ static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ;
     PyObject *result;
@@ -19575,14 +19755,14 @@ static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * PyCommandEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyCommandEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyCommandEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *result;
     char *kwnames[] = {
@@ -19604,7 +19784,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_PyApp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PyApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19629,7 +19809,7 @@ static PyObject *_wrap_delete_PyApp(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -19660,7 +19840,7 @@ static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyApp_GetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString result;
@@ -19692,7 +19872,7 @@ static PyObject *_wrap_PyApp_GetAppName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
@@ -19733,7 +19913,7 @@ static PyObject *_wrap_PyApp_SetAppName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyApp_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString result;
@@ -19765,7 +19945,7 @@ static PyObject *_wrap_PyApp_GetClassName(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetClassName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
@@ -19806,7 +19986,7 @@ static PyObject *_wrap_PyApp_SetClassName(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_GetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *result;
@@ -19841,7 +20021,7 @@ static PyObject *_wrap_PyApp_GetVendorName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxString *arg2 = 0 ;
@@ -19882,7 +20062,7 @@ static PyObject *_wrap_PyApp_SetVendorName(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyApp_GetTraits(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetTraits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxAppTraits *result;
@@ -19908,7 +20088,7 @@ static PyObject *_wrap_PyApp_GetTraits(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19933,7 +20113,7 @@ static PyObject *_wrap_PyApp_ProcessPendingEvents(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Yield(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool arg2 = (bool) False ;
@@ -19948,7 +20128,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19967,7 +20147,7 @@ static PyObject *_wrap_PyApp_Yield(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PyApp_WakeUpIdle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_WakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19992,7 +20172,7 @@ static PyObject *_wrap_PyApp_WakeUpIdle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyApp_MainLoop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_MainLoop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int result;
@@ -20011,14 +20191,14 @@ static PyObject *_wrap_PyApp_MainLoop(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyApp_Exit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20043,7 +20223,7 @@ static PyObject *_wrap_PyApp_Exit(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PyApp_ExitMainLoop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_ExitMainLoop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20068,7 +20248,7 @@ static PyObject *_wrap_PyApp_ExitMainLoop(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Pending(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -20096,7 +20276,7 @@ static PyObject *_wrap_PyApp_Pending(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_Dispatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -20124,7 +20304,7 @@ static PyObject *_wrap_PyApp_Dispatch(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_ProcessIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -20152,7 +20332,7 @@ static PyObject *_wrap_PyApp_ProcessIdle(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -20193,7 +20373,7 @@ static PyObject *_wrap_PyApp_SendIdleEvents(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_IsActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -20221,7 +20401,7 @@ static PyObject *_wrap_PyApp_IsActive(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyApp_SetTopWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetTopWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -20250,7 +20430,7 @@ static PyObject *_wrap_PyApp_SetTopWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_GetTopWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetTopWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     wxWindow *result;
@@ -20278,7 +20458,7 @@ static PyObject *_wrap_PyApp_GetTopWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool arg2 ;
@@ -20291,7 +20471,7 @@ static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetExitOnFrameDelete",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20307,7 +20487,7 @@ static PyObject *_wrap_PyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -20335,7 +20515,7 @@ static PyObject *_wrap_PyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool arg2 ;
@@ -20348,7 +20528,7 @@ static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetUseBestVisual",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20364,7 +20544,7 @@ static PyObject *_wrap_PyApp_SetUseBestVisual(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     bool result;
@@ -20392,7 +20572,7 @@ static PyObject *_wrap_PyApp_GetUseBestVisual(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyApp_SetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int arg2 ;
@@ -20405,7 +20585,7 @@ static PyObject *_wrap_PyApp_SetPrintMode(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetPrintMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20421,7 +20601,7 @@ static PyObject *_wrap_PyApp_SetPrintMode(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int result;
@@ -20440,14 +20620,14 @@ static PyObject *_wrap_PyApp_GetPrintMode(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetAssertMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int arg2 ;
@@ -20460,7 +20640,7 @@ static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyApp_SetAssertMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyApp,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20476,7 +20656,7 @@ static PyObject *_wrap_PyApp_SetAssertMode(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetAssertMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     int result;
@@ -20495,14 +20675,14 @@ static PyObject *_wrap_PyApp_GetAssertMode(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -20526,7 +20706,7 @@ static PyObject *_wrap_PyApp_GetMacSupportPCMenuShortcuts(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -20541,14 +20721,14 @@ static PyObject *_wrap_PyApp_GetMacAboutMenuItemId(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -20563,14 +20743,14 @@ static PyObject *_wrap_PyApp_GetMacPreferencesMenuItemId(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -20585,14 +20765,14 @@ static PyObject *_wrap_PyApp_GetMacExitMenuItemId(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyApp_GetMacHelpMenuTitleName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetMacHelpMenuTitleName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -20620,7 +20800,7 @@ static PyObject *_wrap_PyApp_GetMacHelpMenuTitleName(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 ;
     PyObject * obj0 = 0 ;
@@ -20629,7 +20809,7 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacSupportPCMenuShortcuts",kwnames,&obj0)) goto fail;
-    arg1 = (bool) SWIG_AsBool(obj0); 
+    arg1 = (bool)SWIG_As_bool(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20645,7 +20825,7 @@ static PyObject *_wrap_PyApp_SetMacSupportPCMenuShortcuts(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -20654,7 +20834,7 @@ static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *arg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacAboutMenuItemId",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20670,7 +20850,7 @@ static PyObject *_wrap_PyApp_SetMacAboutMenuItemId(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -20679,7 +20859,7 @@ static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacPreferencesMenuItemId",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20695,7 +20875,7 @@ static PyObject *_wrap_PyApp_SetMacPreferencesMenuItemId(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -20704,7 +20884,7 @@ static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyApp_SetMacExitMenuItemId",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20720,7 +20900,7 @@ static PyObject *_wrap_PyApp_SetMacExitMenuItemId(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -20757,7 +20937,7 @@ static PyObject *_wrap_PyApp_SetMacHelpMenuTitleName(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyApp__BootstrapApp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp__BootstrapApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *arg1 = (wxPyApp *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20782,7 +20962,7 @@ static PyObject *_wrap_PyApp__BootstrapApp(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -20797,21 +20977,21 @@ static PyObject *_wrap_PyApp_GetComCtl32Version(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PyApp_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyApp_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyApp, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Exit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Exit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -20832,7 +21012,7 @@ static PyObject *_wrap_Exit(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_Yield(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Yield(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -20856,7 +21036,7 @@ static PyObject *_wrap_Yield(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_YieldIfNeeded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -20880,7 +21060,7 @@ static PyObject *_wrap_YieldIfNeeded(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SafeYield(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     bool arg2 = (bool) False ;
@@ -20897,7 +21077,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -20916,7 +21096,7 @@ static PyObject *_wrap_SafeYield(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_WakeUpIdle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WakeUpIdle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -20937,7 +21117,7 @@ static PyObject *_wrap_WakeUpIdle(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_PostEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PostEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) 0 ;
     wxEvent *arg2 = 0 ;
@@ -20971,7 +21151,7 @@ static PyObject *_wrap_PostEvent(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_App_CleanUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_App_CleanUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -20992,7 +21172,7 @@ static PyObject *_wrap_App_CleanUp(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_GetApp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetApp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyApp *result;
     char *kwnames[] = {
@@ -21016,7 +21196,7 @@ static PyObject *_wrap_GetApp(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -21031,15 +21211,15 @@ static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_AcceleratorEntry",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21056,7 +21236,7 @@ static PyObject *_wrap_new_AcceleratorEntry(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_AcceleratorEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21081,7 +21261,7 @@ static PyObject *_wrap_delete_AcceleratorEntry(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int arg2 ;
@@ -21098,11 +21278,11 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AcceleratorEntry_Set",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxAcceleratorEntry,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21118,7 +21298,7 @@ static PyObject *_wrap_AcceleratorEntry_Set(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int result;
@@ -21137,14 +21317,14 @@ static PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int result;
@@ -21163,14 +21343,14 @@ static PyObject *_wrap_AcceleratorEntry_GetKeyCode(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
     int result;
@@ -21189,21 +21369,21 @@ static PyObject *_wrap_AcceleratorEntry_GetCommand(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * AcceleratorEntry_swigregister(PyObject *self, PyObject *args) {
+static PyObject * AcceleratorEntry_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorEntry, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_AcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ;
@@ -21239,7 +21419,7 @@ static PyObject *_wrap_new_AcceleratorTable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_AcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21264,7 +21444,7 @@ static PyObject *_wrap_delete_AcceleratorTable(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_AcceleratorTable_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxAcceleratorTable *arg1 = (wxAcceleratorTable *) 0 ;
     bool result;
@@ -21292,14 +21472,14 @@ static PyObject *_wrap_AcceleratorTable_Ok(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * AcceleratorTable_swigregister(PyObject *self, PyObject *args) {
+static PyObject * AcceleratorTable_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxAcceleratorTable, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_NullAcceleratorTable_set(PyObject *_val) {
+static int _wrap_NullAcceleratorTable_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullAcceleratorTable is read-only.");
     return 1;
 }
@@ -21313,7 +21493,7 @@ static PyObject *_wrap_NullAcceleratorTable_get() {
 }
 
 
-static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetAccelFromString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxAcceleratorEntry *result;
@@ -21351,7 +21531,7 @@ static PyObject *_wrap_GetAccelFromString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static int _wrap_PanelNameStr_set(PyObject *_val) {
+static int _wrap_PanelNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable PanelNameStr is read-only.");
     return 1;
 }
@@ -21371,7 +21551,7 @@ static PyObject *_wrap_PanelNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_VisualAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_VisualAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *result;
     char *kwnames[] = {
@@ -21393,7 +21573,7 @@ static PyObject *_wrap_new_VisualAttributes(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_VisualAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_VisualAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21418,7 +21598,7 @@ static PyObject *_wrap_delete_VisualAttributes(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_VisualAttributes_font_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_font_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -21442,7 +21622,7 @@ static PyObject *_wrap_VisualAttributes_font_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_VisualAttributes_font_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_font_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     wxFont *result;
@@ -21463,7 +21643,7 @@ static PyObject *_wrap_VisualAttributes_font_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_VisualAttributes_colFg_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colFg_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     wxColour *arg2 = (wxColour *) 0 ;
@@ -21487,7 +21667,7 @@ static PyObject *_wrap_VisualAttributes_colFg_set(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_VisualAttributes_colFg_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colFg_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     wxColour *result;
@@ -21508,7 +21688,7 @@ static PyObject *_wrap_VisualAttributes_colFg_get(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_VisualAttributes_colBg_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colBg_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     wxColour *arg2 = (wxColour *) 0 ;
@@ -21532,7 +21712,7 @@ static PyObject *_wrap_VisualAttributes_colBg_set(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_VisualAttributes_colBg_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VisualAttributes_colBg_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVisualAttributes *arg1 = (wxVisualAttributes *) 0 ;
     wxColour *result;
@@ -21553,14 +21733,14 @@ static PyObject *_wrap_VisualAttributes_colBg_get(PyObject *self, PyObject *args
 }
 
 
-static PyObject * VisualAttributes_swigregister(PyObject *self, PyObject *args) {
+static PyObject * VisualAttributes_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxVisualAttributes, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Window(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -21589,7 +21769,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -21605,7 +21785,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -21638,7 +21818,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *result;
     char *kwnames[] = {
@@ -21661,7 +21841,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21694,7 +21874,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -21710,7 +21890,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -21744,7 +21924,7 @@ static PyObject *_wrap_Window_Create(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Close(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) False ;
@@ -21759,7 +21939,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21778,7 +21958,7 @@ static PyObject *_wrap_Window_Close(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -21806,7 +21986,7 @@ static PyObject *_wrap_Window_Destroy(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DestroyChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -21834,7 +22014,7 @@ static PyObject *_wrap_Window_DestroyChildren(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsBeingDeleted(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -21862,7 +22042,7 @@ static PyObject *_wrap_Window_IsBeingDeleted(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -21903,7 +22083,7 @@ static PyObject *_wrap_Window_SetTitle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -21935,7 +22115,7 @@ static PyObject *_wrap_Window_GetTitle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -21976,7 +22156,7 @@ static PyObject *_wrap_Window_SetLabel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -22008,7 +22188,7 @@ static PyObject *_wrap_Window_GetLabel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -22049,7 +22229,7 @@ static PyObject *_wrap_Window_SetName(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -22081,7 +22261,7 @@ static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_SetWindowVariant(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetWindowVariant(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -22094,7 +22274,7 @@ static PyObject *_wrap_Window_SetWindowVariant(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowVariant",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxWindowVariant) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22110,7 +22290,7 @@ static PyObject *_wrap_Window_SetWindowVariant(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_GetWindowVariant(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetWindowVariant(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -22129,14 +22309,14 @@ static PyObject *_wrap_Window_GetWindowVariant(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -22149,7 +22329,7 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22165,7 +22345,7 @@ static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -22184,14 +22364,14 @@ static PyObject *_wrap_Window_GetId(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_NewControlId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_NewControlId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -22206,14 +22386,14 @@ static PyObject *_wrap_Window_NewControlId(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_NextControlId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int result;
@@ -22223,7 +22403,7 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_NextControlId",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22232,14 +22412,14 @@ static PyObject *_wrap_Window_NextControlId(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PrevControlId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int result;
@@ -22249,7 +22429,7 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_PrevControlId",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22258,14 +22438,14 @@ static PyObject *_wrap_Window_PrevControlId(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -22297,7 +22477,7 @@ static PyObject *_wrap_Window_SetSize(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_SetDimensions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetDimensions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -22318,16 +22498,16 @@ static PyObject *_wrap_Window_SetDimensions(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetDimensions",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22344,7 +22524,7 @@ static PyObject *_wrap_Window_SetDimensions(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -22365,7 +22545,7 @@ static PyObject *_wrap_Window_SetRect(PyObject *self, PyObject *args, PyObject *
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22382,7 +22562,7 @@ static PyObject *_wrap_Window_SetRect(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_SetSizeWH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -22397,9 +22577,9 @@ static PyObject *_wrap_Window_SetSizeWH(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22415,7 +22595,7 @@ static PyObject *_wrap_Window_SetSizeWH(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Move(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -22436,7 +22616,7 @@ static PyObject *_wrap_Window_Move(PyObject *self, PyObject *args, PyObject *kwa
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22453,7 +22633,7 @@ static PyObject *_wrap_Window_Move(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MoveXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -22470,12 +22650,12 @@ static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_MoveXY",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22492,7 +22672,7 @@ static PyObject *_wrap_Window_MoveXY(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_SetBestFittingSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize const &arg2_defvalue = wxDefaultSize ;
@@ -22527,7 +22707,7 @@ static PyObject *_wrap_Window_SetBestFittingSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_Raise(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Raise(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22552,7 +22732,7 @@ static PyObject *_wrap_Window_Raise(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Window_Lower(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Lower(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22577,7 +22757,7 @@ static PyObject *_wrap_Window_Lower(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Window_SetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -22609,7 +22789,7 @@ static PyObject *_wrap_Window_SetClientSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_SetClientSizeWH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetClientSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -22624,9 +22804,9 @@ static PyObject *_wrap_Window_SetClientSizeWH(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetClientSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22642,7 +22822,7 @@ static PyObject *_wrap_Window_SetClientSizeWH(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_SetClientRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -22674,7 +22854,7 @@ static PyObject *_wrap_Window_SetClientRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint result;
@@ -22704,20 +22884,22 @@ static PyObject *_wrap_Window_GetPosition(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetPositionTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22729,21 +22911,17 @@ static PyObject *_wrap_Window_GetPositionTuple(PyObject *self, PyObject *args, P
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -22773,20 +22951,22 @@ static PyObject *_wrap_Window_GetSize(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetSizeTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22798,21 +22978,17 @@ static PyObject *_wrap_Window_GetSizeTuple(PyObject *self, PyObject *args, PyObj
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect result;
@@ -22842,7 +23018,7 @@ static PyObject *_wrap_Window_GetRect(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_GetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -22872,20 +23048,22 @@ static PyObject *_wrap_Window_GetClientSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetClientSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetClientSizeTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22897,21 +23075,17 @@ static PyObject *_wrap_Window_GetClientSizeTuple(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetClientAreaOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientAreaOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint result;
@@ -22941,7 +23115,7 @@ static PyObject *_wrap_Window_GetClientAreaOrigin(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_GetClientRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect result;
@@ -22971,7 +23145,7 @@ static PyObject *_wrap_Window_GetClientRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23001,20 +23175,22 @@ static PyObject *_wrap_Window_GetBestSize(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_GetBestSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetBestSizeTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -23026,21 +23202,17 @@ static PyObject *_wrap_Window_GetBestSizeTuple(PyObject *self, PyObject *args, P
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_InvalidateBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InvalidateBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23065,7 +23237,7 @@ static PyObject *_wrap_Window_InvalidateBestSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_GetBestFittingSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23095,7 +23267,7 @@ static PyObject *_wrap_Window_GetBestFittingSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23125,7 +23297,7 @@ static PyObject *_wrap_Window_GetAdjustedBestSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_Center(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Center(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBOTH ;
@@ -23139,7 +23311,7 @@ static PyObject *_wrap_Window_Center(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23156,7 +23328,7 @@ static PyObject *_wrap_Window_Center(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_CenterOnScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CenterOnScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBOTH ;
@@ -23170,7 +23342,7 @@ static PyObject *_wrap_Window_CenterOnScreen(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23187,7 +23359,7 @@ static PyObject *_wrap_Window_CenterOnScreen(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_CenterOnParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CenterOnParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBOTH ;
@@ -23201,7 +23373,7 @@ static PyObject *_wrap_Window_CenterOnParent(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23218,7 +23390,7 @@ static PyObject *_wrap_Window_CenterOnParent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_Fit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Fit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23243,7 +23415,7 @@ static PyObject *_wrap_Window_Fit(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FitInside(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23268,7 +23440,7 @@ static PyObject *_wrap_Window_FitInside(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -23291,24 +23463,24 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Window_SetSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23325,7 +23497,7 @@ static PyObject *_wrap_Window_SetSizeHints(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_SetSizeHintsSz(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizeHintsSz(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -23377,7 +23549,7 @@ static PyObject *_wrap_Window_SetSizeHintsSz(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -23396,16 +23568,16 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_SetVirtualSizeHints",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23422,7 +23594,7 @@ static PyObject *_wrap_Window_SetVirtualSizeHints(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_SetVirtualSizeHintsSz(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSizeHintsSz(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -23464,7 +23636,7 @@ static PyObject *_wrap_Window_SetVirtualSizeHintsSz(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23494,7 +23666,7 @@ static PyObject *_wrap_Window_GetMaxSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23524,7 +23696,7 @@ static PyObject *_wrap_Window_GetMinSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -23556,7 +23728,7 @@ static PyObject *_wrap_Window_SetMinSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_SetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -23588,7 +23760,7 @@ static PyObject *_wrap_Window_SetMaxSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMinWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -23607,14 +23779,14 @@ static PyObject *_wrap_Window_GetMinWidth(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMinHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -23633,14 +23805,14 @@ static PyObject *_wrap_Window_GetMinHeight(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMaxWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -23659,14 +23831,14 @@ static PyObject *_wrap_Window_GetMaxWidth(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetMaxHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -23685,14 +23857,14 @@ static PyObject *_wrap_Window_GetMaxHeight(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -23724,7 +23896,7 @@ static PyObject *_wrap_Window_SetVirtualSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -23739,9 +23911,9 @@ static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_SetVirtualSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23757,7 +23929,7 @@ static PyObject *_wrap_Window_SetVirtualSizeWH(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_GetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23787,20 +23959,22 @@ static PyObject *_wrap_Window_GetVirtualSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_GetVirtualSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetVirtualSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetVirtualSizeTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -23812,21 +23986,17 @@ static PyObject *_wrap_Window_GetVirtualSizeTuple(PyObject *self, PyObject *args
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize result;
@@ -23856,7 +24026,7 @@ static PyObject *_wrap_Window_GetBestVirtualSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -23871,7 +24041,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23890,7 +24060,7 @@ static PyObject *_wrap_Window_Show(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Hide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -23918,7 +24088,7 @@ static PyObject *_wrap_Window_Hide(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -23933,7 +24103,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -23952,7 +24122,7 @@ static PyObject *_wrap_Window_Enable(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Disable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -23980,7 +24150,7 @@ static PyObject *_wrap_Window_Disable(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24008,7 +24178,7 @@ static PyObject *_wrap_Window_IsShown(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24036,7 +24206,7 @@ static PyObject *_wrap_Window_IsEnabled(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -24049,7 +24219,7 @@ static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowStyleFlag",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24065,7 +24235,7 @@ static PyObject *_wrap_Window_SetWindowStyleFlag(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long result;
@@ -24084,14 +24254,14 @@ static PyObject *_wrap_Window_GetWindowStyleFlag(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -24105,7 +24275,7 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasFlag",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24123,7 +24293,7 @@ static PyObject *_wrap_Window_HasFlag(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsRetained(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24151,7 +24321,7 @@ static PyObject *_wrap_Window_IsRetained(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_SetExtraStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetExtraStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -24164,7 +24334,7 @@ static PyObject *_wrap_Window_SetExtraStyle(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetExtraStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24180,7 +24350,7 @@ static PyObject *_wrap_Window_SetExtraStyle(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetExtraStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long result;
@@ -24199,14 +24369,14 @@ static PyObject *_wrap_Window_GetExtraStyle(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MakeModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -24220,7 +24390,7 @@ static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24237,7 +24407,7 @@ static PyObject *_wrap_Window_MakeModal(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetThemeEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetThemeEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 ;
@@ -24250,7 +24420,7 @@ static PyObject *_wrap_Window_SetThemeEnabled(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetThemeEnabled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24266,7 +24436,7 @@ static PyObject *_wrap_Window_SetThemeEnabled(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetThemeEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24294,7 +24464,7 @@ static PyObject *_wrap_Window_GetThemeEnabled(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_SetFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24319,7 +24489,7 @@ static PyObject *_wrap_Window_SetFocus(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetFocusFromKbd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetFocusFromKbd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24344,7 +24514,7 @@ static PyObject *_wrap_Window_SetFocusFromKbd(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_FindFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FindFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *result;
     char *kwnames[] = {
@@ -24369,7 +24539,7 @@ static PyObject *_wrap_Window_FindFocus(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24397,7 +24567,7 @@ static PyObject *_wrap_Window_AcceptsFocus(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24425,7 +24595,7 @@ static PyObject *_wrap_Window_AcceptsFocusFromKeyboard(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -24453,7 +24623,7 @@ static PyObject *_wrap_Window_GetDefaultItem(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_SetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24485,7 +24655,7 @@ static PyObject *_wrap_Window_SetDefaultItem(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24514,7 +24684,7 @@ static PyObject *_wrap_Window_SetTmpDefaultItem(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_Navigate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Navigate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxNavigationKeyEvent::IsForward ;
@@ -24529,7 +24699,7 @@ static PyObject *_wrap_Window_Navigate(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24548,7 +24718,7 @@ static PyObject *_wrap_Window_Navigate(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_MoveAfterInTabOrder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MoveAfterInTabOrder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24577,7 +24747,7 @@ static PyObject *_wrap_Window_MoveAfterInTabOrder(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_MoveBeforeInTabOrder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_MoveBeforeInTabOrder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24606,7 +24776,7 @@ static PyObject *_wrap_Window_MoveBeforeInTabOrder(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Window_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject *result;
@@ -24632,7 +24802,7 @@ static PyObject *_wrap_Window_GetChildren(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -24660,7 +24830,7 @@ static PyObject *_wrap_Window_GetParent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetGrandParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetGrandParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -24688,7 +24858,7 @@ static PyObject *_wrap_Window_GetGrandParent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsTopLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -24716,7 +24886,7 @@ static PyObject *_wrap_Window_IsTopLevel(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Reparent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24748,7 +24918,7 @@ static PyObject *_wrap_Window_Reparent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24777,7 +24947,7 @@ static PyObject *_wrap_Window_AddChild(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -24806,7 +24976,7 @@ static PyObject *_wrap_Window_RemoveChild(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_FindWindowById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FindWindowById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -24820,7 +24990,7 @@ static PyObject *_wrap_Window_FindWindowById(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FindWindowById",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24838,7 +25008,7 @@ static PyObject *_wrap_Window_FindWindowById(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FindWindowByName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -24882,7 +25052,7 @@ static PyObject *_wrap_Window_FindWindowByName(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *result;
@@ -24910,7 +25080,7 @@ static PyObject *_wrap_Window_GetEventHandler(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -24939,7 +25109,7 @@ static PyObject *_wrap_Window_SetEventHandler(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_PushEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PushEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -24968,7 +25138,7 @@ static PyObject *_wrap_Window_PushEventHandler(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PopEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) False ;
@@ -24983,7 +25153,7 @@ static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25002,7 +25172,7 @@ static PyObject *_wrap_Window_PopEventHandler(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RemoveEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -25034,7 +25204,7 @@ static PyObject *_wrap_Window_RemoveEventHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_SetValidator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetValidator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxValidator *arg2 = 0 ;
@@ -25068,7 +25238,7 @@ static PyObject *_wrap_Window_SetValidator(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_GetValidator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetValidator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxValidator *result;
@@ -25096,7 +25266,7 @@ static PyObject *_wrap_Window_GetValidator(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25124,7 +25294,7 @@ static PyObject *_wrap_Window_Validate(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25152,7 +25322,7 @@ static PyObject *_wrap_Window_TransferDataToWindow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Window_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25180,7 +25350,7 @@ static PyObject *_wrap_Window_TransferDataFromWindow(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Window_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25205,7 +25375,7 @@ static PyObject *_wrap_Window_InitDialog(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxAcceleratorTable *arg2 = 0 ;
@@ -25239,7 +25409,7 @@ static PyObject *_wrap_Window_SetAcceleratorTable(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_GetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetAcceleratorTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxAcceleratorTable *result;
@@ -25265,7 +25435,7 @@ static PyObject *_wrap_Window_GetAcceleratorTable(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RegisterHotKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25283,11 +25453,11 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_RegisterHotKey",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25305,7 +25475,7 @@ static PyObject *_wrap_Window_RegisterHotKey(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_UnregisterHotKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25319,7 +25489,7 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_UnregisterHotKey",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25337,7 +25507,7 @@ static PyObject *_wrap_Window_UnregisterHotKey(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_ConvertDialogPointToPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertDialogPointToPixels(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -25374,7 +25544,7 @@ static PyObject *_wrap_Window_ConvertDialogPointToPixels(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_Window_ConvertDialogSizeToPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertDialogSizeToPixels(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -25411,7 +25581,7 @@ static PyObject *_wrap_Window_ConvertDialogSizeToPixels(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Window_DLG_PNT(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DLG_PNT(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -25448,7 +25618,7 @@ static PyObject *_wrap_Window_DLG_PNT(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_DLG_SZE(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_DLG_SZE(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -25485,7 +25655,7 @@ static PyObject *_wrap_Window_DLG_SZE(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_ConvertPixelPointToDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertPixelPointToDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -25522,7 +25692,7 @@ static PyObject *_wrap_Window_ConvertPixelPointToDialog(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Window_ConvertPixelSizeToDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ConvertPixelSizeToDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -25559,7 +25729,7 @@ static PyObject *_wrap_Window_ConvertPixelSizeToDialog(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Window_WarpPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_WarpPointer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25574,9 +25744,9 @@ static PyObject *_wrap_Window_WarpPointer(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_WarpPointer",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25592,7 +25762,7 @@ static PyObject *_wrap_Window_WarpPointer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_CaptureMouse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_CaptureMouse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25617,7 +25787,7 @@ static PyObject *_wrap_Window_CaptureMouse(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_ReleaseMouse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ReleaseMouse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25642,7 +25812,7 @@ static PyObject *_wrap_Window_ReleaseMouse(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_GetCapture(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCapture(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *result;
     char *kwnames[] = {
@@ -25667,7 +25837,7 @@ static PyObject *_wrap_Window_GetCapture(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasCapture(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -25695,7 +25865,7 @@ static PyObject *_wrap_Window_HasCapture(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Refresh(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -25711,7 +25881,7 @@ static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -25732,7 +25902,7 @@ static PyObject *_wrap_Window_Refresh(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_RefreshRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_RefreshRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -25764,7 +25934,7 @@ static PyObject *_wrap_Window_RefreshRect(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_Update(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Update(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25789,7 +25959,7 @@ static PyObject *_wrap_Window_Update(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_ClearBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ClearBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25814,7 +25984,7 @@ static PyObject *_wrap_Window_ClearBackground(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_Freeze(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Freeze(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25839,7 +26009,7 @@ static PyObject *_wrap_Window_Freeze(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_Thaw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Thaw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -25864,7 +26034,7 @@ static PyObject *_wrap_Window_Thaw(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Window_PrepareDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PrepareDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxDC *arg2 = 0 ;
@@ -25898,7 +26068,7 @@ static PyObject *_wrap_Window_PrepareDC(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetUpdateRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetUpdateRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRegion *result;
@@ -25927,7 +26097,7 @@ static PyObject *_wrap_Window_GetUpdateRegion(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Window_GetUpdateClientRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetUpdateClientRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect result;
@@ -25957,7 +26127,7 @@ static PyObject *_wrap_Window_GetUpdateClientRect(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsExposed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -25977,16 +26147,16 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Window_IsExposed",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -26005,7 +26175,7 @@ static PyObject *_wrap_Window_IsExposed(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsExposedPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -26040,7 +26210,7 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_IsExposedRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_IsExposedRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -26075,7 +26245,7 @@ static PyObject *_wrap_Window_IsExposedRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxVisualAttributes result;
@@ -26105,7 +26275,7 @@ static PyObject *_wrap_Window_GetDefaultAttributes(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -26116,7 +26286,7 @@ static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Window_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -26138,7 +26308,7 @@ static PyObject *_wrap_Window_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -26173,7 +26343,7 @@ static PyObject *_wrap_Window_SetBackgroundColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_SetOwnBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetOwnBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -26205,7 +26375,7 @@ static PyObject *_wrap_Window_SetOwnBackgroundColour(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -26240,7 +26410,7 @@ static PyObject *_wrap_Window_SetForegroundColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -26272,7 +26442,7 @@ static PyObject *_wrap_Window_SetOwnForegroundColour(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Window_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour result;
@@ -26302,7 +26472,7 @@ static PyObject *_wrap_Window_GetBackgroundColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_GetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetForegroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColour result;
@@ -26332,7 +26502,7 @@ static PyObject *_wrap_Window_GetForegroundColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Window_SetBackgroundStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetBackgroundStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -26346,7 +26516,7 @@ static PyObject *_wrap_Window_SetBackgroundStyle(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetBackgroundStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxBackgroundStyle) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26364,7 +26534,7 @@ static PyObject *_wrap_Window_SetBackgroundStyle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_GetBackgroundStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetBackgroundStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -26383,14 +26553,14 @@ static PyObject *_wrap_Window_GetBackgroundStyle(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCursor *arg2 = 0 ;
@@ -26427,7 +26597,7 @@ static PyObject *_wrap_Window_SetCursor(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCursor result;
@@ -26457,7 +26627,7 @@ static PyObject *_wrap_Window_GetCursor(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFont *arg2 = 0 ;
@@ -26494,7 +26664,7 @@ static PyObject *_wrap_Window_SetFont(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_SetOwnFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetOwnFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFont *arg2 = 0 ;
@@ -26528,7 +26698,7 @@ static PyObject *_wrap_Window_SetOwnFont(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFont result;
@@ -26558,7 +26728,7 @@ static PyObject *_wrap_Window_GetFont(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Window_SetCaret(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetCaret(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCaret *arg2 = (wxCaret *) 0 ;
@@ -26587,7 +26757,7 @@ static PyObject *_wrap_Window_SetCaret(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetCaret(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCaret(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCaret *result;
@@ -26613,7 +26783,7 @@ static PyObject *_wrap_Window_GetCaret(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCharHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -26632,14 +26802,14 @@ static PyObject *_wrap_Window_GetCharHeight(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetCharWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -26658,14 +26828,14 @@ static PyObject *_wrap_Window_GetCharWidth(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -26673,15 +26843,17 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb
     int *arg4 = (int *) 0 ;
     bool temp2 = False ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "string", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetTextExtent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -26698,14 +26870,10 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -26720,7 +26888,7 @@ static PyObject *_wrap_Window_GetTextExtent(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetFullTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -26731,9 +26899,13 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args,
     wxFont *arg7 = (wxFont *) NULL ;
     bool temp2 = False ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     int temp6 ;
+    int res6 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26741,10 +26913,10 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args,
         (char *) "self",(char *) "string",(char *) "font", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
-    arg6 = &temp6;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
+    arg6 = &temp6; res6 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Window_GetFullTextExtent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -26765,22 +26937,14 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg6));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res6 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg6)) : SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -26795,13 +26959,15 @@ static PyObject *_wrap_Window_GetFullTextExtent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_ClientToScreenXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ClientToScreenXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26813,14 +26979,20 @@ static PyObject *_wrap_Window_ClientToScreenXY(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
-        temp2 = PyInt_AsLong(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_int,0) != -1)) {
+            temp2 = SWIG_As_int(obj1);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
-        temp3 = PyInt_AsLong(obj2);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg3 = &temp3;
+        if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_int,0) != -1)) {
+            temp3 = SWIG_As_int(obj2);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = &temp3;
+            res3 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26830,27 +27002,25 @@ static PyObject *_wrap_Window_ClientToScreenXY(PyObject *self, PyObject *args, P
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_ScreenToClientXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScreenToClientXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -26862,14 +27032,20 @@ static PyObject *_wrap_Window_ScreenToClientXY(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
-        temp2 = PyInt_AsLong(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_int,0) != -1)) {
+            temp2 = SWIG_As_int(obj1);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
-        temp3 = PyInt_AsLong(obj2);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg3 = &temp3;
+        if (!(SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_int,0) != -1)) {
+            temp3 = SWIG_As_int(obj2);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg3 = &temp3;
+            res3 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26879,21 +27055,17 @@ static PyObject *_wrap_Window_ScreenToClientXY(PyObject *self, PyObject *args, P
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_ClientToScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ClientToScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -26930,7 +27102,7 @@ static PyObject *_wrap_Window_ClientToScreen(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScreenToClient(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -26967,7 +27139,7 @@ static PyObject *_wrap_Window_ScreenToClient(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HitTestXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -26983,9 +27155,9 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Window_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26994,14 +27166,14 @@ static PyObject *_wrap_Window_HitTestXY(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -27027,14 +27199,14 @@ static PyObject *_wrap_Window_HitTest(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetBorder__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_Window_GetBorder__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 ;
@@ -27045,7 +27217,7 @@ static PyObject *_wrap_Window_GetBorder__SWIG_0(PyObject *self, PyObject *args)
     if(!PyArg_ParseTuple(args,(char *)"OO:Window_GetBorder",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27054,14 +27226,14 @@ static PyObject *_wrap_Window_GetBorder__SWIG_0(PyObject *self, PyObject *args)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetBorder__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_Window_GetBorder__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -27077,7 +27249,7 @@ static PyObject *_wrap_Window_GetBorder__SWIG_1(PyObject *self, PyObject *args)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
@@ -27120,7 +27292,7 @@ static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
-            _v = SWIG_CheckLong(argv[1]);
+            _v = SWIG_Check_long(argv[1]);
             if (_v) {
                 return _wrap_Window_GetBorder__SWIG_0(self,args);
             }
@@ -27132,7 +27304,7 @@ static PyObject *_wrap_Window_GetBorder(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_Window_UpdateWindowUI(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_UpdateWindowUI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long arg2 = (long) wxUPDATE_UI_NONE ;
@@ -27146,7 +27318,7 @@ static PyObject *_wrap_Window_UpdateWindowUI(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27163,7 +27335,7 @@ static PyObject *_wrap_Window_UpdateWindowUI(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PopupMenuXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -27184,11 +27356,11 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27207,7 +27379,7 @@ static PyObject *_wrap_Window_PopupMenuXY(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PopupMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -27249,7 +27421,7 @@ static PyObject *_wrap_Window_PopupMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_GetHandle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetHandle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     long result;
@@ -27268,14 +27440,14 @@ static PyObject *_wrap_Window_GetHandle(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_HasScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27289,7 +27461,7 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_HasScrollbar",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27307,7 +27479,7 @@ static PyObject *_wrap_Window_HasScrollbar(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetScrollbar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27328,16 +27500,16 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Window_SetScrollbar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (bool) SWIG_AsBool(obj5); 
+        arg6 = (bool)SWIG_As_bool(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27354,7 +27526,7 @@ static PyObject *_wrap_Window_SetScrollbar(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetScrollPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27371,12 +27543,12 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_SetScrollPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27393,7 +27565,7 @@ static PyObject *_wrap_Window_SetScrollPos(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetScrollPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27407,7 +27579,7 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollPos",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27416,14 +27588,14 @@ static PyObject *_wrap_Window_GetScrollPos(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetScrollThumb(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27437,7 +27609,7 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollThumb",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27446,14 +27618,14 @@ static PyObject *_wrap_Window_GetScrollThumb(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetScrollRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27467,7 +27639,7 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_GetScrollRange",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27476,14 +27648,14 @@ static PyObject *_wrap_Window_GetScrollRange(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Window_ScrollWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScrollWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27500,9 +27672,9 @@ static PyObject *_wrap_Window_ScrollWindow(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Window_ScrollWindow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxRect,
@@ -27522,7 +27694,7 @@ static PyObject *_wrap_Window_ScrollWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScrollLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27536,7 +27708,7 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollLines",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27554,7 +27726,7 @@ static PyObject *_wrap_Window_ScrollLines(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ScrollPages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -27568,7 +27740,7 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_ScrollPages",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27586,7 +27758,7 @@ static PyObject *_wrap_Window_ScrollPages(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_LineUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27614,7 +27786,7 @@ static PyObject *_wrap_Window_LineUp(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_LineDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27642,7 +27814,7 @@ static PyObject *_wrap_Window_LineDown(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PageUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27670,7 +27842,7 @@ static PyObject *_wrap_Window_PageUp(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_PageDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -27698,7 +27870,7 @@ static PyObject *_wrap_Window_PageDown(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetHelpText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -27739,7 +27911,7 @@ static PyObject *_wrap_Window_SetHelpText(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetHelpTextForId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -27780,7 +27952,7 @@ static PyObject *_wrap_Window_SetHelpTextForId(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_GetHelpText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetHelpText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString result;
@@ -27812,7 +27984,7 @@ static PyObject *_wrap_Window_GetHelpText(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetToolTipString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -27853,7 +28025,7 @@ static PyObject *_wrap_Window_SetToolTipString(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Window_SetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxToolTip *arg2 = (wxToolTip *) 0 ;
@@ -27882,7 +28054,7 @@ static PyObject *_wrap_Window_SetToolTip(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_GetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxToolTip *result;
@@ -27910,7 +28082,7 @@ static PyObject *_wrap_Window_GetToolTip(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPyDropTarget *arg2 = (wxPyDropTarget *) 0 ;
@@ -27939,7 +28111,7 @@ static PyObject *_wrap_Window_SetDropTarget(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPyDropTarget *result;
@@ -27965,7 +28137,7 @@ static PyObject *_wrap_Window_GetDropTarget(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_SetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxLayoutConstraints *arg2 = (wxLayoutConstraints *) 0 ;
@@ -27994,7 +28166,7 @@ static PyObject *_wrap_Window_SetConstraints(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_GetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxLayoutConstraints *result;
@@ -28020,7 +28192,7 @@ static PyObject *_wrap_Window_GetConstraints(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_SetAutoLayout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetAutoLayout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool arg2 ;
@@ -28033,7 +28205,7 @@ static PyObject *_wrap_Window_SetAutoLayout(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetAutoLayout",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28049,7 +28221,7 @@ static PyObject *_wrap_Window_SetAutoLayout(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetAutoLayout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28077,7 +28249,7 @@ static PyObject *_wrap_Window_GetAutoLayout(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28105,7 +28277,7 @@ static PyObject *_wrap_Window_Layout(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -28123,7 +28295,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28140,7 +28312,7 @@ static PyObject *_wrap_Window_SetSizer(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetSizerAndFit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -28158,7 +28330,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28175,7 +28347,7 @@ static PyObject *_wrap_Window_SetSizerAndFit(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Window_GetSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *result;
@@ -28203,7 +28375,7 @@ static PyObject *_wrap_Window_GetSizer(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Window_SetContainingSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_SetContainingSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -28232,7 +28404,7 @@ static PyObject *_wrap_Window_SetContainingSizer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_GetContainingSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSizer *result;
@@ -28260,7 +28432,7 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_InheritAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_InheritAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28285,7 +28457,7 @@ static PyObject *_wrap_Window_InheritAttributes(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Window_ShouldInheritColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     bool result;
@@ -28313,14 +28485,14 @@ static PyObject *_wrap_Window_ShouldInheritColours(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * Window_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Window_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_FindWindowById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -28332,7 +28504,7 @@ static PyObject *_wrap_FindWindowById(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:FindWindowById",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
         if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
@@ -28355,7 +28527,7 @@ static PyObject *_wrap_FindWindowById(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowByName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -28402,7 +28574,7 @@ static PyObject *_wrap_FindWindowByName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowByLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -28449,7 +28621,7 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Window_FromHWND(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     unsigned long arg2 ;
@@ -28463,7 +28635,7 @@ static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FromHWND",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (unsigned long)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -28481,7 +28653,7 @@ static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Validator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *result;
     char *kwnames[] = {
@@ -28503,7 +28675,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Validator_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxValidator *result;
@@ -28531,7 +28703,7 @@ static PyObject *_wrap_Validator_Clone(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28563,7 +28735,7 @@ static PyObject *_wrap_Validator_Validate(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_TransferToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     bool result;
@@ -28591,7 +28763,7 @@ static PyObject *_wrap_Validator_TransferToWindow(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_TransferFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     bool result;
@@ -28619,7 +28791,7 @@ static PyObject *_wrap_Validator_TransferFromWindow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Validator_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxWindow *result;
@@ -28647,7 +28819,7 @@ static PyObject *_wrap_Validator_GetWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Validator_SetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxValidator *arg1 = (wxValidator *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -28676,7 +28848,7 @@ static PyObject *_wrap_Validator_SetWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_IsSilent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -28700,7 +28872,7 @@ static PyObject *_wrap_Validator_IsSilent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Validator_SetBellOnError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) True ;
     PyObject * obj0 = 0 ;
@@ -28710,7 +28882,7 @@ static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Validator_SetBellOnError",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28727,14 +28899,14 @@ static PyObject *_wrap_Validator_SetBellOnError(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * Validator_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Validator_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxValidator, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyValidator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyValidator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyValidator *result;
     char *kwnames[] = {
@@ -28756,7 +28928,7 @@ static PyObject *_wrap_new_PyValidator(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyValidator *arg1 = (wxPyValidator *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -28776,7 +28948,7 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar
     arg2 = obj1;
     arg3 = obj2;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28793,14 +28965,14 @@ static PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * PyValidator_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyValidator_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyValidator, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_DefaultValidator_set(PyObject *_val) {
+static int _wrap_DefaultValidator_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DefaultValidator is read-only.");
     return 1;
 }
@@ -28814,7 +28986,7 @@ static PyObject *_wrap_DefaultValidator_get() {
 }
 
 
-static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Menu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -28836,7 +29008,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
         }
     }
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28862,7 +29034,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -28885,7 +29057,7 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -28900,7 +29072,7 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj4) {
-        arg5 = (wxItemKind) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28935,7 +29107,7 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_AppendSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *result;
@@ -28963,7 +29135,7 @@ static PyObject *_wrap_Menu_AppendSeparator(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -28984,7 +29156,7 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29030,7 +29202,7 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29051,7 +29223,7 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_AppendRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29097,7 +29269,7 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29120,7 +29292,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_AppendMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29168,7 +29340,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_AppendItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_AppendItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -29200,7 +29372,7 @@ static PyObject *_wrap_Menu_AppendItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Break(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Break(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject * obj0 = 0 ;
@@ -29225,7 +29397,7 @@ static PyObject *_wrap_Menu_Break(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -29241,7 +29413,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenuItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -29261,7 +29433,7 @@ static PyObject *_wrap_Menu_InsertItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -29286,9 +29458,9 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -29303,7 +29475,7 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj5) {
-        arg6 = (wxItemKind) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29338,7 +29510,7 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -29352,7 +29524,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_InsertSeparator",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29370,7 +29542,7 @@ static PyObject *_wrap_Menu_InsertSeparator(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -29393,9 +29565,9 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -29441,7 +29613,7 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -29464,9 +29636,9 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -29512,7 +29684,7 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_InsertMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -29537,9 +29709,9 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -29587,7 +29759,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_PrependItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -29619,7 +29791,7 @@ static PyObject *_wrap_Menu_PrependItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Prepend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29642,7 +29814,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29657,7 +29829,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (wxItemKind) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -29692,7 +29864,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Menu_PrependSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *result;
@@ -29720,7 +29892,7 @@ static PyObject *_wrap_Menu_PrependSeparator(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependCheckItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29741,7 +29913,7 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependCheckItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29787,7 +29959,7 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependRadioItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29808,7 +29980,7 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Menu_PrependRadioItem",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29854,7 +30026,7 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_PrependMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29877,7 +30049,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:Menu_PrependMenu",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -29925,7 +30097,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -29939,7 +30111,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Remove",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -29957,7 +30129,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_RemoveItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_RemoveItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -29989,7 +30161,7 @@ static PyObject *_wrap_Menu_RemoveItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30003,7 +30175,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_Delete",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30021,7 +30193,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_DeleteItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -30053,7 +30225,7 @@ static PyObject *_wrap_Menu_DeleteItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30078,7 +30250,7 @@ static PyObject *_wrap_Menu_Destroy(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_DestroyId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30092,7 +30264,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_DestroyId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30110,7 +30282,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_DestroyItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuItem *arg2 = (wxMenuItem *) 0 ;
@@ -30142,7 +30314,7 @@ static PyObject *_wrap_Menu_DestroyItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t result;
@@ -30161,14 +30333,14 @@ static PyObject *_wrap_Menu_GetMenuItemCount(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Menu_GetMenuItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetMenuItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject *result;
@@ -30194,7 +30366,7 @@ static PyObject *_wrap_Menu_GetMenuItems(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_FindItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString *arg2 = 0 ;
@@ -30221,7 +30393,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -30236,7 +30408,7 @@ static PyObject *_wrap_Menu_FindItem(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_FindItemById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30250,7 +30422,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemById",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30268,7 +30440,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Menu_FindItemByPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_FindItemByPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     size_t arg2 ;
@@ -30282,7 +30454,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_FindItemByPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30300,7 +30472,7 @@ static PyObject *_wrap_Menu_FindItemByPosition(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30315,9 +30487,9 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30333,7 +30505,7 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30347,7 +30519,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsEnabled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30365,7 +30537,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30380,9 +30552,9 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30398,7 +30570,7 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30412,7 +30584,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_IsChecked",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30430,7 +30602,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30446,7 +30618,7 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -30475,7 +30647,7 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30489,7 +30661,7 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetLabel",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30511,7 +30683,7 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30527,7 +30699,7 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Menu_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -30556,7 +30728,7 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     int arg2 ;
@@ -30570,7 +30742,7 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Menu_GetHelpString",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -30592,7 +30764,7 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString *arg2 = 0 ;
@@ -30633,7 +30805,7 @@ static PyObject *_wrap_Menu_SetTitle(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Menu_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxString result;
@@ -30665,7 +30837,7 @@ static PyObject *_wrap_Menu_GetTitle(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Menu_SetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -30694,7 +30866,7 @@ static PyObject *_wrap_Menu_SetEventHandler(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_GetEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetEventHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxEvtHandler *result;
@@ -30722,7 +30894,7 @@ static PyObject *_wrap_Menu_GetEventHandler(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Menu_SetInvokingWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetInvokingWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -30751,7 +30923,7 @@ static PyObject *_wrap_Menu_SetInvokingWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Menu_GetInvokingWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetInvokingWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxWindow *result;
@@ -30779,7 +30951,7 @@ static PyObject *_wrap_Menu_GetInvokingWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Menu_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     long result;
@@ -30798,14 +30970,14 @@ static PyObject *_wrap_Menu_GetStyle(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Menu_UpdateUI(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_UpdateUI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) NULL ;
@@ -30836,7 +31008,7 @@ static PyObject *_wrap_Menu_UpdateUI(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Menu_GetMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuBar *result;
@@ -30864,7 +31036,7 @@ static PyObject *_wrap_Menu_GetMenuBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_Attach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenuBarBase *arg2 = (wxMenuBarBase *) 0 ;
@@ -30893,7 +31065,7 @@ static PyObject *_wrap_Menu_Attach(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     PyObject * obj0 = 0 ;
@@ -30918,7 +31090,7 @@ static PyObject *_wrap_Menu_Detach(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_IsAttached(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     bool result;
@@ -30946,7 +31118,7 @@ static PyObject *_wrap_Menu_IsAttached(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Menu_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -30975,7 +31147,7 @@ static PyObject *_wrap_Menu_SetParent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Menu_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Menu_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) 0 ;
     wxMenu *result;
@@ -31003,14 +31175,14 @@ static PyObject *_wrap_Menu_GetParent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * Menu_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Menu_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenu, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 = (long) 0 ;
     wxMenuBar *result;
@@ -31021,7 +31193,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MenuBar",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (long) SWIG_AsLong(obj0); 
+        arg1 = (long)SWIG_As_long(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -31039,7 +31211,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -31087,7 +31259,7 @@ static PyObject *_wrap_MenuBar_Append(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31106,7 +31278,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Insert",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -31139,7 +31311,7 @@ static PyObject *_wrap_MenuBar_Insert(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t result;
@@ -31158,14 +31330,14 @@ static PyObject *_wrap_MenuBar_GetMenuCount(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MenuBar_GetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31179,7 +31351,7 @@ static PyObject *_wrap_MenuBar_GetMenu(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetMenu",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31197,7 +31369,7 @@ static PyObject *_wrap_MenuBar_GetMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31216,7 +31388,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:MenuBar_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxMenu,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -31249,7 +31421,7 @@ static PyObject *_wrap_MenuBar_Replace(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuBar_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31263,7 +31435,7 @@ static PyObject *_wrap_MenuBar_Remove(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_Remove",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31281,7 +31453,7 @@ static PyObject *_wrap_MenuBar_Remove(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuBar_EnableTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_EnableTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31296,9 +31468,9 @@ static PyObject *_wrap_MenuBar_EnableTop(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_EnableTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31314,7 +31486,7 @@ static PyObject *_wrap_MenuBar_EnableTop(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31328,7 +31500,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabledTop",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31346,7 +31518,7 @@ static PyObject *_wrap_MenuBar_IsEnabledTop(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31362,7 +31534,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabelTop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -31391,7 +31563,7 @@ static PyObject *_wrap_MenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     size_t arg2 ;
@@ -31405,7 +31577,7 @@ static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabelTop",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31427,7 +31599,7 @@ static PyObject *_wrap_MenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxString *arg2 = 0 ;
@@ -31462,7 +31634,7 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -31485,7 +31657,7 @@ static PyObject *_wrap_MenuBar_FindMenuItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_FindItemById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31499,7 +31671,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_FindItemById",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31517,7 +31689,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_FindMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxString *arg2 = 0 ;
@@ -31544,7 +31716,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -31559,7 +31731,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31574,9 +31746,9 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Enable",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31592,7 +31764,7 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31607,9 +31779,9 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_Check",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31625,7 +31797,7 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31639,7 +31811,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsChecked",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31657,7 +31829,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31671,7 +31843,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_IsEnabled",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31689,7 +31861,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31705,7 +31877,7 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetLabel",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -31734,7 +31906,7 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31748,7 +31920,7 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetLabel",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31770,7 +31942,7 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_SetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31786,7 +31958,7 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:MenuBar_SetHelpString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -31815,7 +31987,7 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetHelpString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     int arg2 ;
@@ -31829,7 +32001,7 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuBar_GetHelpString",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -31851,7 +32023,7 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MenuBar_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxFrame *result;
@@ -31879,7 +32051,7 @@ static PyObject *_wrap_MenuBar_GetFrame(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_IsAttached(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     bool result;
@@ -31907,7 +32079,7 @@ static PyObject *_wrap_MenuBar_IsAttached(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MenuBar_Attach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Attach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -31936,7 +32108,7 @@ static PyObject *_wrap_MenuBar_Attach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuBar_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuBar_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuBar *arg1 = (wxMenuBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -31961,14 +32133,14 @@ static PyObject *_wrap_MenuBar_Detach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * MenuBar_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MenuBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenuBar, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MenuItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenu *arg1 = (wxMenu *) NULL ;
     int arg2 = (int) wxID_ANY ;
@@ -31997,7 +32169,7 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -32015,7 +32187,7 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (wxItemKind) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -32054,7 +32226,7 @@ static PyObject *_wrap_new_MenuItem(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_MenuItem_GetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *result;
@@ -32082,7 +32254,7 @@ static PyObject *_wrap_MenuItem_GetMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_SetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -32111,7 +32283,7 @@ static PyObject *_wrap_MenuItem_SetMenu(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int arg2 ;
@@ -32124,7 +32296,7 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32140,7 +32312,7 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuItem_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int result;
@@ -32159,14 +32331,14 @@ static PyObject *_wrap_MenuItem_GetId(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsSeparator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -32194,7 +32366,7 @@ static PyObject *_wrap_MenuItem_IsSeparator(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *arg2 = 0 ;
@@ -32235,7 +32407,7 @@ static PyObject *_wrap_MenuItem_SetText(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString result;
@@ -32267,7 +32439,7 @@ static PyObject *_wrap_MenuItem_GetLabel(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuItem_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *result;
@@ -32302,7 +32474,7 @@ static PyObject *_wrap_MenuItem_GetText(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -32346,7 +32518,7 @@ static PyObject *_wrap_MenuItem_GetLabelFromText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MenuItem_GetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int result;
@@ -32365,14 +32537,14 @@ static PyObject *_wrap_MenuItem_GetKind(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MenuItem_SetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     int arg2 ;
@@ -32385,7 +32557,7 @@ static PyObject *_wrap_MenuItem_SetKind(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetKind",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxItemKind) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32401,7 +32573,7 @@ static PyObject *_wrap_MenuItem_SetKind(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_SetCheckable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetCheckable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 ;
@@ -32414,7 +32586,7 @@ static PyObject *_wrap_MenuItem_SetCheckable(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MenuItem_SetCheckable",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -32430,7 +32602,7 @@ static PyObject *_wrap_MenuItem_SetCheckable(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsCheckable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -32458,7 +32630,7 @@ static PyObject *_wrap_MenuItem_IsCheckable(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -32486,7 +32658,7 @@ static PyObject *_wrap_MenuItem_IsSubMenu(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MenuItem_SetSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -32515,7 +32687,7 @@ static PyObject *_wrap_MenuItem_SetSubMenu(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxMenu *result;
@@ -32543,7 +32715,7 @@ static PyObject *_wrap_MenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 = (bool) True ;
@@ -32557,7 +32729,7 @@ static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32574,7 +32746,7 @@ static PyObject *_wrap_MenuItem_Enable(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -32602,7 +32774,7 @@ static PyObject *_wrap_MenuItem_IsEnabled(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_Check(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool arg2 = (bool) True ;
@@ -32616,7 +32788,7 @@ static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMenuItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -32633,7 +32805,7 @@ static PyObject *_wrap_MenuItem_Check(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_IsChecked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     bool result;
@@ -32661,7 +32833,7 @@ static PyObject *_wrap_MenuItem_IsChecked(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MenuItem_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -32686,7 +32858,7 @@ static PyObject *_wrap_MenuItem_Toggle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *arg2 = 0 ;
@@ -32727,7 +32899,7 @@ static PyObject *_wrap_MenuItem_SetHelp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_GetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxString *result;
@@ -32762,7 +32934,7 @@ static PyObject *_wrap_MenuItem_GetHelp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MenuItem_GetAccel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetAccel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxAcceleratorEntry *result;
@@ -32788,7 +32960,7 @@ static PyObject *_wrap_MenuItem_GetAccel(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuItem_SetAccel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetAccel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxAcceleratorEntry *arg2 = (wxAcceleratorEntry *) 0 ;
@@ -32817,7 +32989,7 @@ static PyObject *_wrap_MenuItem_SetAccel(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -32832,14 +33004,14 @@ static PyObject *_wrap_MenuItem_GetDefaultMarginWidth(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MenuItem_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -32873,7 +33045,7 @@ static PyObject *_wrap_MenuItem_SetBitmap(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MenuItem_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MenuItem_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMenuItem *arg1 = (wxMenuItem *) 0 ;
     wxBitmap *result;
@@ -32905,14 +33077,14 @@ static PyObject *_wrap_MenuItem_GetBitmap(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * MenuItem_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MenuItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMenuItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ControlNameStr_set(PyObject *_val) {
+static int _wrap_ControlNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ControlNameStr is read-only.");
     return 1;
 }
@@ -32932,7 +33104,7 @@ static PyObject *_wrap_ControlNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Control(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -32964,7 +33136,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -32980,7 +33152,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -33022,7 +33194,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *result;
     char *kwnames[] = {
@@ -33045,7 +33217,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -33081,7 +33253,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -33097,7 +33269,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -33140,7 +33312,7 @@ static PyObject *_wrap_Control_Create(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Control_Command(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_Command(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxCommandEvent *arg2 = 0 ;
@@ -33174,7 +33346,7 @@ static PyObject *_wrap_Control_Command(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Control_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_GetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxString result;
@@ -33206,7 +33378,7 @@ static PyObject *_wrap_Control_GetLabel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_SetLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxControl *arg1 = (wxControl *) 0 ;
     wxString *arg2 = 0 ;
@@ -33247,7 +33419,7 @@ static PyObject *_wrap_Control_SetLabel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -33258,7 +33430,7 @@ static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Control_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -33280,14 +33452,14 @@ static PyObject *_wrap_Control_GetClassDefaultAttributes(PyObject *self, PyObjec
 }
 
 
-static PyObject * Control_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Control_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxControl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -33319,7 +33491,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -33334,7 +33506,7 @@ static PyObject *_wrap_ItemContainer_Append(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_AppendItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxArrayString *arg2 = 0 ;
@@ -33389,7 +33561,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -33413,7 +33585,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         arg4 = obj3;
@@ -33425,7 +33597,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -33440,7 +33612,7 @@ static PyObject *_wrap_ItemContainer_Insert(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ItemContainer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -33465,7 +33637,7 @@ static PyObject *_wrap_ItemContainer_Clear(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ItemContainer_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Delete(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -33478,7 +33650,7 @@ static PyObject *_wrap_ItemContainer_Delete(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Delete",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -33494,7 +33666,7 @@ static PyObject *_wrap_ItemContainer_Delete(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ItemContainer_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int result;
@@ -33513,14 +33685,14 @@ static PyObject *_wrap_ItemContainer_GetCount(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     bool result;
@@ -33548,7 +33720,7 @@ static PyObject *_wrap_ItemContainer_IsEmpty(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ItemContainer_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -33562,7 +33734,7 @@ static PyObject *_wrap_ItemContainer_GetString(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetString",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -33584,7 +33756,7 @@ static PyObject *_wrap_ItemContainer_GetString(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ItemContainer_GetStrings(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetStrings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxArrayString result;
@@ -33612,7 +33784,7 @@ static PyObject *_wrap_ItemContainer_GetStrings(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_SetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -33628,7 +33800,7 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetString",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -33657,7 +33829,7 @@ static PyObject *_wrap_ItemContainer_SetString(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_FindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString *arg2 = 0 ;
@@ -33684,7 +33856,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -33699,7 +33871,7 @@ static PyObject *_wrap_ItemContainer_FindString(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ItemContainer_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -33712,7 +33884,7 @@ static PyObject *_wrap_ItemContainer_Select(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_Select",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -33728,7 +33900,7 @@ static PyObject *_wrap_ItemContainer_Select(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ItemContainer_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int result;
@@ -33747,14 +33919,14 @@ static PyObject *_wrap_ItemContainer_GetSelection(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ItemContainer_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     wxString result;
@@ -33786,7 +33958,7 @@ static PyObject *_wrap_ItemContainer_GetStringSelection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ItemContainer_GetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_GetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -33800,7 +33972,7 @@ static PyObject *_wrap_ItemContainer_GetClientData(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ItemContainer_GetClientData",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -33816,7 +33988,7 @@ static PyObject *_wrap_ItemContainer_GetClientData(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ItemContainer_SetClientData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ItemContainer_SetClientData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxItemContainer *arg1 = (wxItemContainer *) 0 ;
     int arg2 ;
@@ -33831,7 +34003,7 @@ static PyObject *_wrap_ItemContainer_SetClientData(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ItemContainer_SetClientData",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxItemContainer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     arg3 = obj2;
     {
@@ -33848,21 +34020,21 @@ static PyObject *_wrap_ItemContainer_SetClientData(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * ItemContainer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ItemContainer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxItemContainer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject * ControlWithItems_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ControlWithItems_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxControlWithItems, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SizerItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizerItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *result;
     char *kwnames[] = {
@@ -33884,7 +34056,7 @@ static PyObject *_wrap_new_SizerItem(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -33904,11 +34076,11 @@ static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:new_SizerItemWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
         arg5 = obj4;
@@ -33927,7 +34099,7 @@ static PyObject *_wrap_new_SizerItemWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizerItemSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -33947,15 +34119,15 @@ static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:new_SizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
         arg6 = obj5;
@@ -33974,7 +34146,7 @@ static PyObject *_wrap_new_SizerItemSpacer(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SizerItemSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     int arg2 ;
@@ -33994,11 +34166,11 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:new_SizerItemSizer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
         arg5 = obj4;
@@ -34017,7 +34189,7 @@ static PyObject *_wrap_new_SizerItemSizer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SizerItem_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_DeleteWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -34042,7 +34214,7 @@ static PyObject *_wrap_SizerItem_DeleteWindows(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SizerItem_DetachSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_DetachSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     PyObject * obj0 = 0 ;
@@ -34067,7 +34239,7 @@ static PyObject *_wrap_SizerItem_DetachSizer(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SizerItem_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -34097,7 +34269,7 @@ static PyObject *_wrap_SizerItem_GetSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizerItem_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -34127,7 +34299,7 @@ static PyObject *_wrap_SizerItem_CalcMin(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizerItem_SetDimension(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxPoint arg2 ;
@@ -34164,7 +34336,7 @@ static PyObject *_wrap_SizerItem_SetDimension(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SizerItem_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -34194,7 +34366,7 @@ static PyObject *_wrap_SizerItem_GetMinSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SizerItem_GetMinSizeWithBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetMinSizeWithBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize result;
@@ -34224,7 +34396,7 @@ static PyObject *_wrap_SizerItem_GetMinSizeWithBorder(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_SizerItem_SetInitSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetInitSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -34239,9 +34411,9 @@ static PyObject *_wrap_SizerItem_SetInitSize(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetInitSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34257,7 +34429,7 @@ static PyObject *_wrap_SizerItem_SetInitSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -34272,9 +34444,9 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SizerItem_SetRatioWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34290,7 +34462,7 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize arg2 ;
@@ -34321,7 +34493,7 @@ static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SizerItem_SetRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     float arg2 ;
@@ -34334,7 +34506,7 @@ static PyObject *_wrap_SizerItem_SetRatio(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetRatio",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (float) SWIG_AsFloat(obj1); 
+    arg2 = (float)SWIG_As_float(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34350,7 +34522,7 @@ static PyObject *_wrap_SizerItem_SetRatio(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SizerItem_GetRatio(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetRatio(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     float result;
@@ -34369,14 +34541,14 @@ static PyObject *_wrap_SizerItem_GetRatio(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromFloat((float)result);
+    resultobj = SWIG_From_float((float)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -34404,7 +34576,7 @@ static PyObject *_wrap_SizerItem_IsWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -34432,7 +34604,7 @@ static PyObject *_wrap_SizerItem_IsSizer(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -34460,7 +34632,7 @@ static PyObject *_wrap_SizerItem_IsSpacer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SizerItem_SetProportion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -34473,7 +34645,7 @@ static PyObject *_wrap_SizerItem_SetProportion(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetProportion",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34489,7 +34661,7 @@ static PyObject *_wrap_SizerItem_SetProportion(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SizerItem_GetProportion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetProportion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int result;
@@ -34508,14 +34680,14 @@ static PyObject *_wrap_SizerItem_GetProportion(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SizerItem_SetFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -34528,7 +34700,7 @@ static PyObject *_wrap_SizerItem_SetFlag(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetFlag",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34544,7 +34716,7 @@ static PyObject *_wrap_SizerItem_SetFlag(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizerItem_GetFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetFlag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int result;
@@ -34563,14 +34735,14 @@ static PyObject *_wrap_SizerItem_GetFlag(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SizerItem_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int arg2 ;
@@ -34583,7 +34755,7 @@ static PyObject *_wrap_SizerItem_SetBorder(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_SetBorder",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34599,7 +34771,7 @@ static PyObject *_wrap_SizerItem_SetBorder(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SizerItem_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     int result;
@@ -34618,14 +34790,14 @@ static PyObject *_wrap_SizerItem_GetBorder(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SizerItem_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxWindow *result;
@@ -34653,7 +34825,7 @@ static PyObject *_wrap_SizerItem_GetWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SizerItem_SetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -34682,7 +34854,7 @@ static PyObject *_wrap_SizerItem_SetWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SizerItem_GetSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSizer *result;
@@ -34710,7 +34882,7 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SizerItem_SetSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -34739,7 +34911,7 @@ static PyObject *_wrap_SizerItem_SetSizer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_SizerItem_GetSpacer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize *result;
@@ -34768,7 +34940,7 @@ static PyObject *_wrap_SizerItem_GetSpacer(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SizerItem_SetSpacer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_SetSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxSize *arg2 = 0 ;
@@ -34800,7 +34972,7 @@ static PyObject *_wrap_SizerItem_SetSpacer(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_SizerItem_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool arg2 ;
@@ -34813,7 +34985,7 @@ static PyObject *_wrap_SizerItem_Show(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SizerItem_Show",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -34829,7 +35001,7 @@ static PyObject *_wrap_SizerItem_Show(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     bool result;
@@ -34857,7 +35029,7 @@ static PyObject *_wrap_SizerItem_IsShown(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SizerItem_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     wxPoint result;
@@ -34887,7 +35059,7 @@ static PyObject *_wrap_SizerItem_GetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SizerItem_GetUserData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SizerItem_GetUserData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizerItem *arg1 = (wxSizerItem *) 0 ;
     PyObject *result;
@@ -34913,14 +35085,14 @@ static PyObject *_wrap_SizerItem_GetUserData(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * SizerItem_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SizerItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSizerItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Sizer__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -34948,7 +35120,7 @@ static PyObject *_wrap_Sizer__setOORInfo(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Sizer_Add(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -34971,15 +35143,15 @@ static PyObject *_wrap_Sizer_Add(PyObject *self, PyObject *args, PyObject *kwarg
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     arg2 = obj1;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -34999,7 +35171,7 @@ static PyObject *_wrap_Sizer_Add(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Sizer_Insert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Insert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     int arg2 ;
@@ -35022,19 +35194,19 @@ static PyObject *_wrap_Sizer_Insert(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:Sizer_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     arg3 = obj2;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -35054,7 +35226,7 @@ static PyObject *_wrap_Sizer_Insert(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Sizer_Prepend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Prepend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35077,15 +35249,15 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *self, PyObject *args, PyObject *k
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     arg2 = obj1;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -35105,7 +35277,7 @@ static PyObject *_wrap_Sizer_Prepend(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35136,7 +35308,7 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Sizer_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35167,7 +35339,7 @@ static PyObject *_wrap_Sizer_Detach(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35202,7 +35374,7 @@ static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Sizer_AddItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_AddItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSizerItem *arg2 = (wxSizerItem *) 0 ;
@@ -35231,7 +35403,7 @@ static PyObject *_wrap_Sizer_AddItem(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Sizer_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_InsertItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     size_t arg2 ;
@@ -35246,7 +35418,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer_InsertItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxSizerItem,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -35264,7 +35436,7 @@ static PyObject *_wrap_Sizer_InsertItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Sizer_PrependItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_PrependItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSizerItem *arg2 = (wxSizerItem *) 0 ;
@@ -35293,7 +35465,7 @@ static PyObject *_wrap_Sizer_PrependItem(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetDimension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     int arg2 ;
@@ -35312,13 +35484,13 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Sizer_SetDimension",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -35334,7 +35506,7 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize *arg2 = 0 ;
@@ -35366,7 +35538,7 @@ static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Sizer_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize result;
@@ -35396,7 +35568,7 @@ static PyObject *_wrap_Sizer_GetSize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Sizer_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxPoint result;
@@ -35426,7 +35598,7 @@ static PyObject *_wrap_Sizer_GetPosition(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Sizer_GetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetMinSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize result;
@@ -35456,7 +35628,7 @@ static PyObject *_wrap_Sizer_GetMinSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Sizer_RecalcSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_RecalcSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -35481,7 +35653,7 @@ static PyObject *_wrap_Sizer_RecalcSizes(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Sizer_CalcMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_CalcMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxSize result;
@@ -35511,7 +35683,7 @@ static PyObject *_wrap_Sizer_CalcMin(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Sizer_Layout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -35536,7 +35708,7 @@ static PyObject *_wrap_Sizer_Layout(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Sizer_Fit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Fit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -35570,7 +35742,7 @@ static PyObject *_wrap_Sizer_Fit(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Sizer_FitInside(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_FitInside(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -35599,7 +35771,7 @@ static PyObject *_wrap_Sizer_FitInside(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Sizer_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -35628,7 +35800,7 @@ static PyObject *_wrap_Sizer_SetSizeHints(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -35657,7 +35829,7 @@ static PyObject *_wrap_Sizer_SetVirtualSizeHints(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     bool arg2 = (bool) False ;
@@ -35671,7 +35843,7 @@ static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -35688,7 +35860,7 @@ static PyObject *_wrap_Sizer_Clear(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Sizer_DeleteWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_DeleteWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -35713,7 +35885,7 @@ static PyObject *_wrap_Sizer_DeleteWindows(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Sizer_GetChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_GetChildren(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *result;
@@ -35739,7 +35911,7 @@ static PyObject *_wrap_Sizer_GetChildren(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35756,7 +35928,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     arg2 = obj1;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -35773,7 +35945,7 @@ static PyObject *_wrap_Sizer_Show(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_IsShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35804,7 +35976,7 @@ static PyObject *_wrap_Sizer_IsShown(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Sizer_ShowItems(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sizer_ShowItems(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     bool arg2 ;
@@ -35817,7 +35989,7 @@ static PyObject *_wrap_Sizer_ShowItems(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_ShowItems",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -35833,14 +36005,14 @@ static PyObject *_wrap_Sizer_ShowItems(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * Sizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Sizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PySizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PySizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPySizer *result;
     char *kwnames[] = {
@@ -35862,7 +36034,7 @@ static PyObject *_wrap_new_PySizer(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_PySizer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PySizer__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPySizer *arg1 = (wxPySizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -35893,14 +36065,14 @@ static PyObject *_wrap_PySizer__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * PySizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PySizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPySizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BoxSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxHORIZONTAL ;
     wxBoxSizer *result;
@@ -35911,7 +36083,7 @@ static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kw
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_BoxSizer",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -35928,7 +36100,7 @@ static PyObject *_wrap_new_BoxSizer(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBoxSizer *arg1 = (wxBoxSizer *) 0 ;
     int result;
@@ -35947,14 +36119,14 @@ static PyObject *_wrap_BoxSizer_GetOrientation(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBoxSizer *arg1 = (wxBoxSizer *) 0 ;
     int arg2 ;
@@ -35967,7 +36139,7 @@ static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BoxSizer_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBoxSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -35983,14 +36155,14 @@ static PyObject *_wrap_BoxSizer_SetOrientation(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * BoxSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BoxSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBoxSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StaticBoxSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBox *arg1 = (wxStaticBox *) 0 ;
     int arg2 = (int) wxHORIZONTAL ;
@@ -36005,7 +36177,7 @@ static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStaticBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36022,7 +36194,7 @@ static PyObject *_wrap_new_StaticBoxSizer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStaticBoxSizer *arg1 = (wxStaticBoxSizer *) 0 ;
     wxStaticBox *result;
@@ -36050,14 +36222,14 @@ static PyObject *_wrap_StaticBoxSizer_GetStaticBox(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * StaticBoxSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StaticBoxSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStaticBoxSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 1 ;
     int arg2 = (int) 0 ;
@@ -36074,19 +36246,19 @@ static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_GridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36103,7 +36275,7 @@ static PyObject *_wrap_new_GridSizer(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_GridSizer_SetCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -36116,7 +36288,7 @@ static PyObject *_wrap_GridSizer_SetCols(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetCols",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36132,7 +36304,7 @@ static PyObject *_wrap_GridSizer_SetCols(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GridSizer_SetRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -36145,7 +36317,7 @@ static PyObject *_wrap_GridSizer_SetRows(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetRows",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36161,7 +36333,7 @@ static PyObject *_wrap_GridSizer_SetRows(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GridSizer_SetVGap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetVGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -36174,7 +36346,7 @@ static PyObject *_wrap_GridSizer_SetVGap(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetVGap",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36190,7 +36362,7 @@ static PyObject *_wrap_GridSizer_SetVGap(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GridSizer_SetHGap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_SetHGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int arg2 ;
@@ -36203,7 +36375,7 @@ static PyObject *_wrap_GridSizer_SetHGap(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridSizer_SetHGap",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36219,7 +36391,7 @@ static PyObject *_wrap_GridSizer_SetHGap(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GridSizer_GetCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -36238,14 +36410,14 @@ static PyObject *_wrap_GridSizer_GetCols(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridSizer_GetRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -36264,14 +36436,14 @@ static PyObject *_wrap_GridSizer_GetRows(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridSizer_GetVGap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetVGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -36290,14 +36462,14 @@ static PyObject *_wrap_GridSizer_GetVGap(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridSizer_GetHGap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizer_GetHGap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizer *arg1 = (wxGridSizer *) 0 ;
     int result;
@@ -36316,21 +36488,21 @@ static PyObject *_wrap_GridSizer_GetHGap(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * GridSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FlexGridSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 1 ;
     int arg2 = (int) 0 ;
@@ -36347,19 +36519,19 @@ static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_FlexGridSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36376,7 +36548,7 @@ static PyObject *_wrap_new_FlexGridSizer(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -36391,10 +36563,10 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableRow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36411,7 +36583,7 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableRow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -36424,7 +36596,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36440,7 +36612,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableRow(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -36455,10 +36627,10 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:FlexGridSizer_AddGrowableCol",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36475,7 +36647,7 @@ static PyObject *_wrap_FlexGridSizer_AddGrowableCol(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     size_t arg2 ;
@@ -36488,7 +36660,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_RemoveGrowableCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36504,7 +36676,7 @@ static PyObject *_wrap_FlexGridSizer_RemoveGrowableCol(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     int arg2 ;
@@ -36517,7 +36689,7 @@ static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetFlexibleDirection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36533,7 +36705,7 @@ static PyObject *_wrap_FlexGridSizer_SetFlexibleDirection(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     int result;
@@ -36552,14 +36724,14 @@ static PyObject *_wrap_FlexGridSizer_GetFlexibleDirection(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     int arg2 ;
@@ -36572,7 +36744,7 @@ static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FlexGridSizer_SetNonFlexibleGrowMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFlexGridSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxFlexSizerGrowMode) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36588,7 +36760,7 @@ static PyObject *_wrap_FlexGridSizer_SetNonFlexibleGrowMode(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     int result;
@@ -36607,14 +36779,14 @@ static PyObject *_wrap_FlexGridSizer_GetNonFlexibleGrowMode(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     wxArrayInt *result;
@@ -36651,7 +36823,7 @@ static PyObject *_wrap_FlexGridSizer_GetRowHeights(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFlexGridSizer *arg1 = (wxFlexGridSizer *) 0 ;
     wxArrayInt *result;
@@ -36688,14 +36860,14 @@ static PyObject *_wrap_FlexGridSizer_GetColWidths(PyObject *self, PyObject *args
 }
 
 
-static PyObject * FlexGridSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FlexGridSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFlexGridSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -36708,11 +36880,11 @@ static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBPosition",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36729,7 +36901,7 @@ static PyObject *_wrap_new_GBPosition(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_GBPosition_GetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_GetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int result;
@@ -36748,14 +36920,14 @@ static PyObject *_wrap_GBPosition_GetRow(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GBPosition_GetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_GetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int result;
@@ -36774,14 +36946,14 @@ static PyObject *_wrap_GBPosition_GetCol(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GBPosition_SetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_SetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int arg2 ;
@@ -36794,7 +36966,7 @@ static PyObject *_wrap_GBPosition_SetRow(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36810,7 +36982,7 @@ static PyObject *_wrap_GBPosition_SetRow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_SetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int arg2 ;
@@ -36823,7 +36995,7 @@ static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBPosition_SetCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -36839,7 +37011,7 @@ static PyObject *_wrap_GBPosition_SetCol(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -36874,7 +37046,7 @@ static PyObject *_wrap_GBPosition___eq__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -36909,7 +37081,7 @@ static PyObject *_wrap_GBPosition___ne__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     int arg2 = (int) 0 ;
@@ -36925,11 +37097,11 @@ static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBPosition,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -36946,7 +37118,7 @@ static PyObject *_wrap_GBPosition_Set(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_GBPosition_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBPosition_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBPosition *arg1 = (wxGBPosition *) 0 ;
     PyObject *result;
@@ -36972,14 +37144,14 @@ static PyObject *_wrap_GBPosition_Get(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * GBPosition_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GBPosition_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGBPosition, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 1 ;
     int arg2 = (int) 1 ;
@@ -36992,11 +37164,11 @@ static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GBSpan",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -37013,7 +37185,7 @@ static PyObject *_wrap_new_GBSpan(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_GBSpan_GetRowspan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_GetRowspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int result;
@@ -37032,14 +37204,14 @@ static PyObject *_wrap_GBSpan_GetRowspan(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GBSpan_GetColspan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_GetColspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int result;
@@ -37058,14 +37230,14 @@ static PyObject *_wrap_GBSpan_GetColspan(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GBSpan_SetRowspan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_SetRowspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int arg2 ;
@@ -37078,7 +37250,7 @@ static PyObject *_wrap_GBSpan_SetRowspan(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetRowspan",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -37094,7 +37266,7 @@ static PyObject *_wrap_GBSpan_SetRowspan(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_SetColspan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int arg2 ;
@@ -37107,7 +37279,7 @@ static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GBSpan_SetColspan",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -37123,7 +37295,7 @@ static PyObject *_wrap_GBSpan_SetColspan(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     wxGBSpan *arg2 = 0 ;
@@ -37158,7 +37330,7 @@ static PyObject *_wrap_GBSpan___eq__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     wxGBSpan *arg2 = 0 ;
@@ -37193,7 +37365,7 @@ static PyObject *_wrap_GBSpan___ne__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     int arg2 = (int) 1 ;
@@ -37209,11 +37381,11 @@ static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGBSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -37230,7 +37402,7 @@ static PyObject *_wrap_GBSpan_Set(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_GBSpan_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSpan_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSpan *arg1 = (wxGBSpan *) 0 ;
     PyObject *result;
@@ -37256,14 +37428,14 @@ static PyObject *_wrap_GBSpan_Get(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject * GBSpan_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GBSpan_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGBSpan, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_DefaultSpan_set(PyObject *_val) {
+static int _wrap_DefaultSpan_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DefaultSpan is read-only.");
     return 1;
 }
@@ -37277,7 +37449,7 @@ static PyObject *_wrap_DefaultSpan_get() {
 }
 
 
-static PyObject *_wrap_new_GBSizerItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSizerItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *result;
     char *kwnames[] = {
@@ -37299,7 +37471,7 @@ static PyObject *_wrap_new_GBSizerItem(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSizerItemWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -37331,9 +37503,9 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO
         arg3 = &temp3;
         if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
         arg6 = obj5;
@@ -37352,7 +37524,7 @@ static PyObject *_wrap_new_GBSizerItemWindow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSizerItemSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -37384,9 +37556,9 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb
         arg3 = &temp3;
         if ( ! wxGBSpan_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
         arg6 = obj5;
@@ -37405,7 +37577,7 @@ static PyObject *_wrap_new_GBSizerItemSizer(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -37429,9 +37601,9 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|O:new_GBSizerItemSpacer",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -37441,9 +37613,9 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO
         arg4 = &temp4;
         if ( ! wxGBSpan_helper(obj3, &arg4)) SWIG_fail;
     }
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (int) SWIG_AsInt(obj5); 
+    arg6 = (int)SWIG_As_int(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj6) {
         arg7 = obj6;
@@ -37462,7 +37634,7 @@ static PyObject *_wrap_new_GBSizerItemSpacer(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GBSizerItem_GetPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition result;
@@ -37492,7 +37664,7 @@ static PyObject *_wrap_GBSizerItem_GetPos(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_GBSizerItem_GetSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBSpan result;
@@ -37522,7 +37694,7 @@ static PyObject *_wrap_GBSizerItem_GetSpan(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_SetPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -37557,7 +37729,7 @@ static PyObject *_wrap_GBSizerItem_SetPos(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBSpan *arg2 = 0 ;
@@ -37592,7 +37764,7 @@ static PyObject *_wrap_GBSizerItem_SetSpan(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GBSizerItem_Intersects(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_Intersects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBSizerItem *arg2 = 0 ;
@@ -37629,7 +37801,7 @@ static PyObject *_wrap_GBSizerItem_Intersects(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GBSizerItem_IntersectsPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_IntersectsPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -37671,7 +37843,7 @@ static PyObject *_wrap_GBSizerItem_IntersectsPos(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GBSizerItem_GetEndPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetEndPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGBPosition result;
@@ -37701,7 +37873,7 @@ static PyObject *_wrap_GBSizerItem_GetEndPos(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GBSizerItem_GetGBSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_GetGBSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGridBagSizer *result;
@@ -37727,7 +37899,7 @@ static PyObject *_wrap_GBSizerItem_GetGBSizer(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GBSizerItem_SetGBSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GBSizerItem_SetGBSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGBSizerItem *arg1 = (wxGBSizerItem *) 0 ;
     wxGridBagSizer *arg2 = (wxGridBagSizer *) 0 ;
@@ -37756,14 +37928,14 @@ static PyObject *_wrap_GBSizerItem_SetGBSizer(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * GBSizerItem_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GBSizerItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGBSizerItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridBagSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -37776,11 +37948,11 @@ static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridBagSizer",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -37797,7 +37969,7 @@ static PyObject *_wrap_new_GridBagSizer(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -37836,11 +38008,11 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -37862,7 +38034,7 @@ static PyObject *_wrap_GridBagSizer_Add(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_AddItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBSizerItem *arg2 = (wxGBSizerItem *) 0 ;
@@ -37894,7 +38066,7 @@ static PyObject *_wrap_GridBagSizer_AddItem(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetEmptyCellSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_GetEmptyCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSize result;
@@ -37924,7 +38096,7 @@ static PyObject *_wrap_GridBagSizer_GetEmptyCellSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetEmptyCellSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_SetEmptyCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSize *arg2 = 0 ;
@@ -37956,7 +38128,7 @@ static PyObject *_wrap_GridBagSizer_SetEmptyCellSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -37987,7 +38159,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_0(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -38018,7 +38190,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_1(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -38029,7 +38201,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition__SWIG_2(PyObject *self, PyOb
     if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemPosition",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -38122,7 +38294,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar
             }
         }
         if (_v) {
-            _v = SWIG_CheckUnsignedLong(argv[1]);
+            _v = SWIG_Check_unsigned_SS_long(argv[1]);
             if (_v) {
                 return _wrap_GridBagSizer_GetItemPosition__SWIG_2(self,args);
             }
@@ -38134,7 +38306,7 @@ static PyObject *_wrap_GridBagSizer_GetItemPosition(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -38170,7 +38342,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_0(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -38206,7 +38378,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_1(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -38220,7 +38392,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition__SWIG_2(PyObject *self, PyOb
     if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemPosition",&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -38325,7 +38497,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar
             }
         }
         if (_v) {
-            _v = SWIG_CheckUnsignedLong(argv[1]);
+            _v = SWIG_Check_unsigned_SS_long(argv[1]);
             if (_v) {
                 {
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBPosition"), 2);
@@ -38342,7 +38514,7 @@ static PyObject *_wrap_GridBagSizer_SetItemPosition(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -38373,7 +38545,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_0(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -38404,7 +38576,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_1(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -38415,7 +38587,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan__SWIG_2(PyObject *self, PyObject
     if(!PyArg_ParseTuple(args,(char *)"OO:GridBagSizer_GetItemSpan",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -38508,7 +38680,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args)
             }
         }
         if (_v) {
-            _v = SWIG_CheckUnsignedLong(argv[1]);
+            _v = SWIG_Check_unsigned_SS_long(argv[1]);
             if (_v) {
                 return _wrap_GridBagSizer_GetItemSpan__SWIG_2(self,args);
             }
@@ -38520,7 +38692,7 @@ static PyObject *_wrap_GridBagSizer_GetItemSpan(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -38556,7 +38728,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_0(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -38592,7 +38764,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_1(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     size_t arg2 ;
@@ -38606,7 +38778,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan__SWIG_2(PyObject *self, PyObject
     if(!PyArg_ParseTuple(args,(char *)"OOO:GridBagSizer_SetItemSpan",&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridBagSizer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -38711,7 +38883,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args)
             }
         }
         if (_v) {
-            _v = SWIG_CheckUnsignedLong(argv[1]);
+            _v = SWIG_Check_unsigned_SS_long(argv[1]);
             if (_v) {
                 {
                     _v = wxPySimple_typecheck(argv[2], wxT("wxGBSpan"), 2);
@@ -38728,7 +38900,7 @@ static PyObject *_wrap_GridBagSizer_SetItemSpan(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_GridBagSizer_FindItem__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_FindItem__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -38755,7 +38927,7 @@ static PyObject *_wrap_GridBagSizer_FindItem__SWIG_0(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridBagSizer_FindItem__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GridBagSizer_FindItem__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxSizer *arg2 = (wxSizer *) 0 ;
@@ -38849,7 +39021,7 @@ static PyObject *_wrap_GridBagSizer_FindItem(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -38882,7 +39054,7 @@ static PyObject *_wrap_GridBagSizer_FindItemAtPosition(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -38915,7 +39087,7 @@ static PyObject *_wrap_GridBagSizer_FindItemAtPoint(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBSizerItem *arg2 = (wxGBSizerItem *) 0 ;
@@ -38953,7 +39125,7 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersection(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_GridBagSizer_CheckForIntersectionPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridBagSizer_CheckForIntersectionPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridBagSizer *arg1 = (wxGridBagSizer *) 0 ;
     wxGBPosition *arg2 = 0 ;
@@ -39001,14 +39173,14 @@ static PyObject *_wrap_GridBagSizer_CheckForIntersectionPos(PyObject *self, PyOb
 }
 
 
-static PyObject * GridBagSizer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridBagSizer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridBagSizer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39029,18 +39201,18 @@ static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:IndividualLayoutConstraint_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxRelationship) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg4 = (wxEdge) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -39057,7 +39229,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Set(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39075,7 +39247,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -39092,7 +39264,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_LeftOf(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39110,7 +39282,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *self, PyObje
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -39127,7 +39299,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_RightOf(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39145,7 +39317,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -39162,7 +39334,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Above(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39180,7 +39352,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -39197,7 +39369,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Below(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39216,10 +39388,10 @@ static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *self, PyObjec
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (wxEdge) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -39236,7 +39408,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SameAs(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39255,9 +39427,9 @@ static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *self, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (wxEdge) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39273,7 +39445,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_PercentOf(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39286,7 +39458,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_Absolute",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39302,7 +39474,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Absolute(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_Unconstrained(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_Unconstrained(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -39327,7 +39499,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_Unconstrained(PyObject *self,
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_AsIs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_AsIs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     PyObject * obj0 = 0 ;
@@ -39352,7 +39524,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_AsIs(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetOtherWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetOtherWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *result;
@@ -39380,7 +39552,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherWindow(PyObject *self,
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -39399,14 +39571,14 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMyEdge(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39419,7 +39591,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetEdge",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxEdge) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39435,7 +39607,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetEdge(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39448,7 +39620,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39464,7 +39636,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetValue(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -39483,14 +39655,14 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetMargin(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39503,7 +39675,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetMargin",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39519,7 +39691,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetMargin(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -39538,14 +39710,14 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetValue(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -39564,14 +39736,14 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetPercent(PyObject *self, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -39590,14 +39762,14 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetOtherEdge(PyObject *self, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     bool result;
@@ -39625,7 +39797,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetDone(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     bool arg2 ;
@@ -39638,7 +39810,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetDone",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39654,7 +39826,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetDone(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int result;
@@ -39673,14 +39845,14 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetRelationship(PyObject *self
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39693,7 +39865,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *self
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IndividualLayoutConstraint_SetRelationship",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxRelationship) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -39709,7 +39881,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SetRelationship(PyObject *self
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -39741,7 +39913,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_ResetIfWin(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     wxLayoutConstraints *arg2 = (wxLayoutConstraints *) 0 ;
@@ -39777,7 +39949,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_SatisfyConstraint(PyObject *se
 }
 
 
-static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIndividualLayoutConstraint *arg1 = (wxIndividualLayoutConstraint *) 0 ;
     int arg2 ;
@@ -39795,7 +39967,7 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:IndividualLayoutConstraint_GetEdge",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxIndividualLayoutConstraint,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxEdge) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -39808,21 +39980,21 @@ static PyObject *_wrap_IndividualLayoutConstraint_GetEdge(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * IndividualLayoutConstraint_swigregister(PyObject *self, PyObject *args) {
+static PyObject * IndividualLayoutConstraint_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIndividualLayoutConstraint, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_LayoutConstraints_left_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_left_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39843,7 +40015,7 @@ static PyObject *_wrap_LayoutConstraints_left_get(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_LayoutConstraints_top_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_top_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39864,7 +40036,7 @@ static PyObject *_wrap_LayoutConstraints_top_get(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_LayoutConstraints_right_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_right_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39885,7 +40057,7 @@ static PyObject *_wrap_LayoutConstraints_right_get(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_LayoutConstraints_bottom_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_bottom_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39906,7 +40078,7 @@ static PyObject *_wrap_LayoutConstraints_bottom_get(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_LayoutConstraints_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_width_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39927,7 +40099,7 @@ static PyObject *_wrap_LayoutConstraints_width_get(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_LayoutConstraints_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_height_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39948,7 +40120,7 @@ static PyObject *_wrap_LayoutConstraints_height_get(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_LayoutConstraints_centreX_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_centreX_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39969,7 +40141,7 @@ static PyObject *_wrap_LayoutConstraints_centreX_get(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_LayoutConstraints_centreY_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_centreY_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxIndividualLayoutConstraint *result;
@@ -39990,7 +40162,7 @@ static PyObject *_wrap_LayoutConstraints_centreY_get(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_new_LayoutConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LayoutConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *result;
     char *kwnames[] = {
@@ -40012,20 +40184,21 @@ static PyObject *_wrap_new_LayoutConstraints(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
     int *arg3 = (int *) 0 ;
     bool result;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "win", NULL 
     };
     
-    arg3 = &temp3;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LayoutConstraints_SatisfyConstraints",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLayoutConstraints,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -40041,17 +40214,15 @@ static PyObject *_wrap_LayoutConstraints_SatisfyConstraints(PyObject *self, PyOb
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutConstraints *arg1 = (wxLayoutConstraints *) 0 ;
     bool result;
@@ -40079,7 +40250,7 @@ static PyObject *_wrap_LayoutConstraints_AreSatisfied(PyObject *self, PyObject *
 }
 
 
-static PyObject * LayoutConstraints_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LayoutConstraints_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLayoutConstraints, obj);
@@ -40087,1249 +40258,1249 @@ static PyObject * LayoutConstraints_swigregister(PyObject *self, PyObject *args)
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS },
-        { (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS },
-        { (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS },
-        { (char *)"Size_width_set", (PyCFunction) _wrap_Size_width_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_width_get", (PyCFunction) _wrap_Size_width_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_height_set", (PyCFunction) _wrap_Size_height_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_height_get", (PyCFunction) _wrap_Size_height_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Size", (PyCFunction) _wrap_new_Size, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Size", (PyCFunction) _wrap_delete_Size, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size___eq__", (PyCFunction) _wrap_Size___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size___ne__", (PyCFunction) _wrap_Size___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size___add__", (PyCFunction) _wrap_Size___add__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size___sub__", (PyCFunction) _wrap_Size___sub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_IncTo", (PyCFunction) _wrap_Size_IncTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_DecTo", (PyCFunction) _wrap_Size_DecTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_Set", (PyCFunction) _wrap_Size_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_SetWidth", (PyCFunction) _wrap_Size_SetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_IsFullySpecified", (PyCFunction) _wrap_Size_IsFullySpecified, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_SetDefaults", (PyCFunction) _wrap_Size_SetDefaults, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS },
-        { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint_x_get", (PyCFunction) _wrap_RealPoint_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint_y_set", (PyCFunction) _wrap_RealPoint_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint_y_get", (PyCFunction) _wrap_RealPoint_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_RealPoint", (PyCFunction) _wrap_new_RealPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_RealPoint", (PyCFunction) _wrap_delete_RealPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint___eq__", (PyCFunction) _wrap_RealPoint___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint___ne__", (PyCFunction) _wrap_RealPoint___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint_Set", (PyCFunction) _wrap_RealPoint_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint_Get", (PyCFunction) _wrap_RealPoint_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RealPoint_swigregister", RealPoint_swigregister, METH_VARARGS },
-        { (char *)"Point_x_set", (PyCFunction) _wrap_Point_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point_x_get", (PyCFunction) _wrap_Point_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point_y_set", (PyCFunction) _wrap_Point_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point_y_get", (PyCFunction) _wrap_Point_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Point", (PyCFunction) _wrap_new_Point, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Point", (PyCFunction) _wrap_delete_Point, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point___eq__", (PyCFunction) _wrap_Point___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point___ne__", (PyCFunction) _wrap_Point___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point___add__", (PyCFunction) _wrap_Point___add__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point___sub__", (PyCFunction) _wrap_Point___sub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point___iadd__", (PyCFunction) _wrap_Point___iadd__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point___isub__", (PyCFunction) _wrap_Point___isub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point_Set", (PyCFunction) _wrap_Point_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point_Get", (PyCFunction) _wrap_Point_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS },
-        { (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_RectPS", (PyCFunction) _wrap_new_RectPS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Rect", (PyCFunction) _wrap_delete_Rect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetX", (PyCFunction) _wrap_Rect_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetX", (PyCFunction) _wrap_Rect_SetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetY", (PyCFunction) _wrap_Rect_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetY", (PyCFunction) _wrap_Rect_SetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetWidth", (PyCFunction) _wrap_Rect_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetWidth", (PyCFunction) _wrap_Rect_SetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetHeight", (PyCFunction) _wrap_Rect_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetHeight", (PyCFunction) _wrap_Rect_SetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetPosition", (PyCFunction) _wrap_Rect_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetPosition", (PyCFunction) _wrap_Rect_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetSize", (PyCFunction) _wrap_Rect_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetSize", (PyCFunction) _wrap_Rect_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetTopLeft", (PyCFunction) _wrap_Rect_GetTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetTopLeft", (PyCFunction) _wrap_Rect_SetTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetBottomRight", (PyCFunction) _wrap_Rect_GetBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetBottomRight", (PyCFunction) _wrap_Rect_SetBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetLeft", (PyCFunction) _wrap_Rect_GetLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetTop", (PyCFunction) _wrap_Rect_GetTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetBottom", (PyCFunction) _wrap_Rect_GetBottom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_GetRight", (PyCFunction) _wrap_Rect_GetRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetLeft", (PyCFunction) _wrap_Rect_SetLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetRight", (PyCFunction) _wrap_Rect_SetRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetTop", (PyCFunction) _wrap_Rect_SetTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_SetBottom", (PyCFunction) _wrap_Rect_SetBottom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Inflate", (PyCFunction) _wrap_Rect_Inflate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Deflate", (PyCFunction) _wrap_Rect_Deflate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_OffsetXY", (PyCFunction) _wrap_Rect_OffsetXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Offset", (PyCFunction) _wrap_Rect_Offset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Intersect", (PyCFunction) _wrap_Rect_Intersect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect___add__", (PyCFunction) _wrap_Rect___add__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect___iadd__", (PyCFunction) _wrap_Rect___iadd__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect___eq__", (PyCFunction) _wrap_Rect___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect___ne__", (PyCFunction) _wrap_Rect___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_InsideXY", (PyCFunction) _wrap_Rect_InsideXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Inside", (PyCFunction) _wrap_Rect_Inside, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Intersects", (PyCFunction) _wrap_Rect_Intersects, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_x_set", (PyCFunction) _wrap_Rect_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_x_get", (PyCFunction) _wrap_Rect_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_y_set", (PyCFunction) _wrap_Rect_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_y_get", (PyCFunction) _wrap_Rect_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_width_set", (PyCFunction) _wrap_Rect_width_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_width_get", (PyCFunction) _wrap_Rect_width_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_height_set", (PyCFunction) _wrap_Rect_height_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_height_get", (PyCFunction) _wrap_Rect_height_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Set", (PyCFunction) _wrap_Rect_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_Get", (PyCFunction) _wrap_Rect_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Rect_swigregister", Rect_swigregister, METH_VARARGS },
-        { (char *)"IntersectRect", (PyCFunction) _wrap_IntersectRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Point2D", (PyCFunction) _wrap_new_Point2D, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Point2DCopy", (PyCFunction) _wrap_new_Point2DCopy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Point2DFromPoint", (PyCFunction) _wrap_new_Point2DFromPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetFloor", (PyCFunction) _wrap_Point2D_GetFloor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetRounded", (PyCFunction) _wrap_Point2D_GetRounded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetVectorLength", (PyCFunction) _wrap_Point2D_GetVectorLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetVectorAngle", (PyCFunction) _wrap_Point2D_GetVectorAngle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_SetVectorLength", (PyCFunction) _wrap_Point2D_SetVectorLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_SetVectorAngle", (PyCFunction) _wrap_Point2D_SetVectorAngle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetDistance", (PyCFunction) _wrap_Point2D_GetDistance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetDistanceSquare", (PyCFunction) _wrap_Point2D_GetDistanceSquare, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetDotProduct", (PyCFunction) _wrap_Point2D_GetDotProduct, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_GetCrossProduct", (PyCFunction) _wrap_Point2D_GetCrossProduct, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___neg__", (PyCFunction) _wrap_Point2D___neg__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___iadd__", (PyCFunction) _wrap_Point2D___iadd__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___isub__", (PyCFunction) _wrap_Point2D___isub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___imul__", (PyCFunction) _wrap_Point2D___imul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___idiv__", (PyCFunction) _wrap_Point2D___idiv__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___eq__", (PyCFunction) _wrap_Point2D___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D___ne__", (PyCFunction) _wrap_Point2D___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_x_set", (PyCFunction) _wrap_Point2D_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_x_get", (PyCFunction) _wrap_Point2D_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_y_set", (PyCFunction) _wrap_Point2D_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_y_get", (PyCFunction) _wrap_Point2D_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_Set", (PyCFunction) _wrap_Point2D_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS },
-        { (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_flush", (PyCFunction) _wrap_InputStream_flush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_eof", (PyCFunction) _wrap_InputStream_eof, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_read", (PyCFunction) _wrap_InputStream_read, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_readline", (PyCFunction) _wrap_InputStream_readline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_readlines", (PyCFunction) _wrap_InputStream_readlines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_seek", (PyCFunction) _wrap_InputStream_seek, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_tell", (PyCFunction) _wrap_InputStream_tell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_Peek", (PyCFunction) _wrap_InputStream_Peek, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_GetC", (PyCFunction) _wrap_InputStream_GetC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_LastRead", (PyCFunction) _wrap_InputStream_LastRead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_CanRead", (PyCFunction) _wrap_InputStream_CanRead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_Eof", (PyCFunction) _wrap_InputStream_Eof, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_Ungetch", (PyCFunction) _wrap_InputStream_Ungetch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_SeekI", (PyCFunction) _wrap_InputStream_SeekI, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_TellI", (PyCFunction) _wrap_InputStream_TellI, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InputStream_swigregister", InputStream_swigregister, METH_VARARGS },
-        { (char *)"OutputStream_write", (PyCFunction) _wrap_OutputStream_write, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"OutputStream_swigregister", OutputStream_swigregister, METH_VARARGS },
-        { (char *)"new_FSFile", (PyCFunction) _wrap_new_FSFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FSFile", (PyCFunction) _wrap_delete_FSFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FSFile_GetStream", (PyCFunction) _wrap_FSFile_GetStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FSFile_GetMimeType", (PyCFunction) _wrap_FSFile_GetMimeType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FSFile_GetLocation", (PyCFunction) _wrap_FSFile_GetLocation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FSFile_GetAnchor", (PyCFunction) _wrap_FSFile_GetAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FSFile_GetModificationTime", (PyCFunction) _wrap_FSFile_GetModificationTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FSFile_swigregister", FSFile_swigregister, METH_VARARGS },
-        { (char *)"CPPFileSystemHandler_swigregister", CPPFileSystemHandler_swigregister, METH_VARARGS },
-        { (char *)"new_FileSystemHandler", (PyCFunction) _wrap_new_FileSystemHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler__setCallbackInfo", (PyCFunction) _wrap_FileSystemHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_CanOpen", (PyCFunction) _wrap_FileSystemHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_OpenFile", (PyCFunction) _wrap_FileSystemHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_FindFirst", (PyCFunction) _wrap_FileSystemHandler_FindFirst, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_FindNext", (PyCFunction) _wrap_FileSystemHandler_FindNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_GetProtocol", (PyCFunction) _wrap_FileSystemHandler_GetProtocol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_GetLeftLocation", (PyCFunction) _wrap_FileSystemHandler_GetLeftLocation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_GetAnchor", (PyCFunction) _wrap_FileSystemHandler_GetAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_GetRightLocation", (PyCFunction) _wrap_FileSystemHandler_GetRightLocation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_GetMimeTypeFromExt", (PyCFunction) _wrap_FileSystemHandler_GetMimeTypeFromExt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystemHandler_swigregister", FileSystemHandler_swigregister, METH_VARARGS },
-        { (char *)"new_FileSystem", (PyCFunction) _wrap_new_FileSystem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FileSystem", (PyCFunction) _wrap_delete_FileSystem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_ChangePathTo", (PyCFunction) _wrap_FileSystem_ChangePathTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_GetPath", (PyCFunction) _wrap_FileSystem_GetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_OpenFile", (PyCFunction) _wrap_FileSystem_OpenFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_FindFirst", (PyCFunction) _wrap_FileSystem_FindFirst, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_FindNext", (PyCFunction) _wrap_FileSystem_FindNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_AddHandler", (PyCFunction) _wrap_FileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_CleanUpHandlers", (PyCFunction) _wrap_FileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_FileNameToURL", (PyCFunction) _wrap_FileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSystem_swigregister", FileSystem_swigregister, METH_VARARGS },
-        { (char *)"FileSystem_URLToFileName", (PyCFunction) _wrap_FileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_InternetFSHandler", (PyCFunction) _wrap_new_InternetFSHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InternetFSHandler_CanOpen", (PyCFunction) _wrap_InternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InternetFSHandler_OpenFile", (PyCFunction) _wrap_InternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InternetFSHandler_swigregister", InternetFSHandler_swigregister, METH_VARARGS },
-        { (char *)"new_ZipFSHandler", (PyCFunction) _wrap_new_ZipFSHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ZipFSHandler_CanOpen", (PyCFunction) _wrap_ZipFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ZipFSHandler_OpenFile", (PyCFunction) _wrap_ZipFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ZipFSHandler_FindFirst", (PyCFunction) _wrap_ZipFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ZipFSHandler_FindNext", (PyCFunction) _wrap_ZipFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ZipFSHandler_swigregister", ZipFSHandler_swigregister, METH_VARARGS },
-        { (char *)"__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_MemoryFSHandler", (PyCFunction) _wrap_new_MemoryFSHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MemoryFSHandler_RemoveFile", (PyCFunction) _wrap_MemoryFSHandler_RemoveFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MemoryFSHandler_CanOpen", (PyCFunction) _wrap_MemoryFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MemoryFSHandler_OpenFile", (PyCFunction) _wrap_MemoryFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MemoryFSHandler_FindFirst", (PyCFunction) _wrap_MemoryFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MemoryFSHandler_FindNext", (PyCFunction) _wrap_MemoryFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MemoryFSHandler_swigregister", MemoryFSHandler_swigregister, METH_VARARGS },
-        { (char *)"ImageHandler_GetName", (PyCFunction) _wrap_ImageHandler_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_GetExtension", (PyCFunction) _wrap_ImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_GetType", (PyCFunction) _wrap_ImageHandler_GetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_GetMimeType", (PyCFunction) _wrap_ImageHandler_GetMimeType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_CanRead", (PyCFunction) _wrap_ImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_SetName", (PyCFunction) _wrap_ImageHandler_SetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_SetExtension", (PyCFunction) _wrap_ImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_SetType", (PyCFunction) _wrap_ImageHandler_SetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_SetMimeType", (PyCFunction) _wrap_ImageHandler_SetMimeType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHandler_swigregister", ImageHandler_swigregister, METH_VARARGS },
-        { (char *)"new_ImageHistogram", (PyCFunction) _wrap_new_ImageHistogram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHistogram_MakeKey", (PyCFunction) _wrap_ImageHistogram_MakeKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHistogram_FindFirstUnusedColour", (PyCFunction) _wrap_ImageHistogram_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageHistogram_swigregister", ImageHistogram_swigregister, METH_VARARGS },
-        { (char *)"new_Image", (PyCFunction) _wrap_new_Image, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Image", (PyCFunction) _wrap_delete_Image, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_ImageFromMime", (PyCFunction) _wrap_new_ImageFromMime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_ImageFromStream", (PyCFunction) _wrap_new_ImageFromStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_ImageFromStreamMime", (PyCFunction) _wrap_new_ImageFromStreamMime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_EmptyImage", (PyCFunction) _wrap_new_EmptyImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Destroy", (PyCFunction) _wrap_Image_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Scale", (PyCFunction) _wrap_Image_Scale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_ShrinkBy", (PyCFunction) _wrap_Image_ShrinkBy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Rescale", (PyCFunction) _wrap_Image_Rescale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetRGB", (PyCFunction) _wrap_Image_SetRGB, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetRed", (PyCFunction) _wrap_Image_GetRed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetGreen", (PyCFunction) _wrap_Image_GetGreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetBlue", (PyCFunction) _wrap_Image_GetBlue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetAlpha", (PyCFunction) _wrap_Image_SetAlpha, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_LoadFile", (PyCFunction) _wrap_Image_LoadFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_LoadMimeFile", (PyCFunction) _wrap_Image_LoadMimeFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SaveFile", (PyCFunction) _wrap_Image_SaveFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SaveMimeFile", (PyCFunction) _wrap_Image_SaveMimeFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_CanReadStream", (PyCFunction) _wrap_Image_CanReadStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_LoadStream", (PyCFunction) _wrap_Image_LoadStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_LoadMimeStream", (PyCFunction) _wrap_Image_LoadMimeStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Ok", (PyCFunction) _wrap_Image_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetWidth", (PyCFunction) _wrap_Image_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetHeight", (PyCFunction) _wrap_Image_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetSize", (PyCFunction) _wrap_Image_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetSubImage", (PyCFunction) _wrap_Image_GetSubImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Copy", (PyCFunction) _wrap_Image_Copy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Paste", (PyCFunction) _wrap_Image_Paste, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetData", (PyCFunction) _wrap_Image_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetData", (PyCFunction) _wrap_Image_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetDataBuffer", (PyCFunction) _wrap_Image_GetDataBuffer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetDataBuffer", (PyCFunction) _wrap_Image_SetDataBuffer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetAlphaData", (PyCFunction) _wrap_Image_GetAlphaData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetAlphaData", (PyCFunction) _wrap_Image_SetAlphaData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetAlphaBuffer", (PyCFunction) _wrap_Image_GetAlphaBuffer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetAlphaBuffer", (PyCFunction) _wrap_Image_SetAlphaBuffer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetMaskColour", (PyCFunction) _wrap_Image_SetMaskColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetMaskRed", (PyCFunction) _wrap_Image_GetMaskRed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetMaskGreen", (PyCFunction) _wrap_Image_GetMaskGreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetMaskBlue", (PyCFunction) _wrap_Image_GetMaskBlue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetMask", (PyCFunction) _wrap_Image_SetMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_HasMask", (PyCFunction) _wrap_Image_HasMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Rotate", (PyCFunction) _wrap_Image_Rotate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Rotate90", (PyCFunction) _wrap_Image_Rotate90, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Mirror", (PyCFunction) _wrap_Image_Mirror, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_Replace", (PyCFunction) _wrap_Image_Replace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_ConvertToMono", (PyCFunction) _wrap_Image_ConvertToMono, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetOption", (PyCFunction) _wrap_Image_SetOption, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_SetOptionInt", (PyCFunction) _wrap_Image_SetOptionInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetOption", (PyCFunction) _wrap_Image_GetOption, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetOptionInt", (PyCFunction) _wrap_Image_GetOptionInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_HasOption", (PyCFunction) _wrap_Image_HasOption, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_CountColours", (PyCFunction) _wrap_Image_CountColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_ComputeHistogram", (PyCFunction) _wrap_Image_ComputeHistogram, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_AddHandler", (PyCFunction) _wrap_Image_AddHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_InsertHandler", (PyCFunction) _wrap_Image_InsertHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_RemoveHandler", (PyCFunction) _wrap_Image_RemoveHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_GetImageExtWildcard", (PyCFunction) _wrap_Image_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_ConvertToBitmap", (PyCFunction) _wrap_Image_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_ConvertToMonoBitmap", (PyCFunction) _wrap_Image_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Image_swigregister", Image_swigregister, METH_VARARGS },
-        { (char *)"new_BMPHandler", (PyCFunction) _wrap_new_BMPHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BMPHandler_swigregister", BMPHandler_swigregister, METH_VARARGS },
-        { (char *)"new_ICOHandler", (PyCFunction) _wrap_new_ICOHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ICOHandler_swigregister", ICOHandler_swigregister, METH_VARARGS },
-        { (char *)"new_CURHandler", (PyCFunction) _wrap_new_CURHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CURHandler_swigregister", CURHandler_swigregister, METH_VARARGS },
-        { (char *)"new_ANIHandler", (PyCFunction) _wrap_new_ANIHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ANIHandler_swigregister", ANIHandler_swigregister, METH_VARARGS },
-        { (char *)"new_PNGHandler", (PyCFunction) _wrap_new_PNGHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PNGHandler_swigregister", PNGHandler_swigregister, METH_VARARGS },
-        { (char *)"new_GIFHandler", (PyCFunction) _wrap_new_GIFHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GIFHandler_swigregister", GIFHandler_swigregister, METH_VARARGS },
-        { (char *)"new_PCXHandler", (PyCFunction) _wrap_new_PCXHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PCXHandler_swigregister", PCXHandler_swigregister, METH_VARARGS },
-        { (char *)"new_JPEGHandler", (PyCFunction) _wrap_new_JPEGHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JPEGHandler_swigregister", JPEGHandler_swigregister, METH_VARARGS },
-        { (char *)"new_PNMHandler", (PyCFunction) _wrap_new_PNMHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PNMHandler_swigregister", PNMHandler_swigregister, METH_VARARGS },
-        { (char *)"new_XPMHandler", (PyCFunction) _wrap_new_XPMHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"XPMHandler_swigregister", XPMHandler_swigregister, METH_VARARGS },
-        { (char *)"new_TIFFHandler", (PyCFunction) _wrap_new_TIFFHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TIFFHandler_swigregister", TIFFHandler_swigregister, METH_VARARGS },
-        { (char *)"Quantize_Quantize", (PyCFunction) _wrap_Quantize_Quantize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Quantize_swigregister", Quantize_swigregister, METH_VARARGS },
-        { (char *)"new_EvtHandler", (PyCFunction) _wrap_new_EvtHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_GetNextHandler", (PyCFunction) _wrap_EvtHandler_GetNextHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_GetPreviousHandler", (PyCFunction) _wrap_EvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_SetNextHandler", (PyCFunction) _wrap_EvtHandler_SetNextHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_SetPreviousHandler", (PyCFunction) _wrap_EvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_GetEvtHandlerEnabled", (PyCFunction) _wrap_EvtHandler_GetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_SetEvtHandlerEnabled", (PyCFunction) _wrap_EvtHandler_SetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_ProcessEvent", (PyCFunction) _wrap_EvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_AddPendingEvent", (PyCFunction) _wrap_EvtHandler_AddPendingEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_ProcessPendingEvents", (PyCFunction) _wrap_EvtHandler_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_Connect", (PyCFunction) _wrap_EvtHandler_Connect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_Disconnect", (PyCFunction) _wrap_EvtHandler_Disconnect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler__setOORInfo", (PyCFunction) _wrap_EvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EvtHandler_swigregister", EvtHandler_swigregister, METH_VARARGS },
-        { (char *)"NewEventType", (PyCFunction) _wrap_NewEventType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Event", (PyCFunction) _wrap_delete_Event, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_SetEventType", (PyCFunction) _wrap_Event_SetEventType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_GetEventType", (PyCFunction) _wrap_Event_GetEventType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_GetEventObject", (PyCFunction) _wrap_Event_GetEventObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_SetEventObject", (PyCFunction) _wrap_Event_SetEventObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_GetTimestamp", (PyCFunction) _wrap_Event_GetTimestamp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_SetTimestamp", (PyCFunction) _wrap_Event_SetTimestamp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_GetId", (PyCFunction) _wrap_Event_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_SetId", (PyCFunction) _wrap_Event_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_IsCommandEvent", (PyCFunction) _wrap_Event_IsCommandEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_Skip", (PyCFunction) _wrap_Event_Skip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_GetSkipped", (PyCFunction) _wrap_Event_GetSkipped, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_ShouldPropagate", (PyCFunction) _wrap_Event_ShouldPropagate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_StopPropagation", (PyCFunction) _wrap_Event_StopPropagation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_ResumePropagation", (PyCFunction) _wrap_Event_ResumePropagation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_Clone", (PyCFunction) _wrap_Event_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Event_swigregister", Event_swigregister, METH_VARARGS },
-        { (char *)"new_PropagationDisabler", (PyCFunction) _wrap_new_PropagationDisabler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PropagationDisabler", (PyCFunction) _wrap_delete_PropagationDisabler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PropagationDisabler_swigregister", PropagationDisabler_swigregister, METH_VARARGS },
-        { (char *)"new_PropagateOnce", (PyCFunction) _wrap_new_PropagateOnce, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PropagateOnce", (PyCFunction) _wrap_delete_PropagateOnce, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PropagateOnce_swigregister", PropagateOnce_swigregister, METH_VARARGS },
-        { (char *)"new_CommandEvent", (PyCFunction) _wrap_new_CommandEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_GetSelection", (PyCFunction) _wrap_CommandEvent_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_SetString", (PyCFunction) _wrap_CommandEvent_SetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_GetString", (PyCFunction) _wrap_CommandEvent_GetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_IsChecked", (PyCFunction) _wrap_CommandEvent_IsChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_IsSelection", (PyCFunction) _wrap_CommandEvent_IsSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_SetExtraLong", (PyCFunction) _wrap_CommandEvent_SetExtraLong, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_GetExtraLong", (PyCFunction) _wrap_CommandEvent_GetExtraLong, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_SetInt", (PyCFunction) _wrap_CommandEvent_SetInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_GetInt", (PyCFunction) _wrap_CommandEvent_GetInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_Clone", (PyCFunction) _wrap_CommandEvent_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CommandEvent_swigregister", CommandEvent_swigregister, METH_VARARGS },
-        { (char *)"new_NotifyEvent", (PyCFunction) _wrap_new_NotifyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotifyEvent_Veto", (PyCFunction) _wrap_NotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotifyEvent_Allow", (PyCFunction) _wrap_NotifyEvent_Allow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotifyEvent_IsAllowed", (PyCFunction) _wrap_NotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NotifyEvent_swigregister", NotifyEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ScrollEvent", (PyCFunction) _wrap_new_ScrollEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollEvent_GetOrientation", (PyCFunction) _wrap_ScrollEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollEvent_GetPosition", (PyCFunction) _wrap_ScrollEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollEvent_SetOrientation", (PyCFunction) _wrap_ScrollEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollEvent_SetPosition", (PyCFunction) _wrap_ScrollEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollEvent_swigregister", ScrollEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ScrollWinEvent", (PyCFunction) _wrap_new_ScrollWinEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollWinEvent_GetOrientation", (PyCFunction) _wrap_ScrollWinEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollWinEvent_GetPosition", (PyCFunction) _wrap_ScrollWinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollWinEvent_SetOrientation", (PyCFunction) _wrap_ScrollWinEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollWinEvent_SetPosition", (PyCFunction) _wrap_ScrollWinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrollWinEvent_swigregister", ScrollWinEvent_swigregister, METH_VARARGS },
-        { (char *)"new_MouseEvent", (PyCFunction) _wrap_new_MouseEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_IsButton", (PyCFunction) _wrap_MouseEvent_IsButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_ButtonDown", (PyCFunction) _wrap_MouseEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_ButtonDClick", (PyCFunction) _wrap_MouseEvent_ButtonDClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_ButtonUp", (PyCFunction) _wrap_MouseEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_Button", (PyCFunction) _wrap_MouseEvent_Button, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_ButtonIsDown", (PyCFunction) _wrap_MouseEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetButton", (PyCFunction) _wrap_MouseEvent_GetButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_ControlDown", (PyCFunction) _wrap_MouseEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_MetaDown", (PyCFunction) _wrap_MouseEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_AltDown", (PyCFunction) _wrap_MouseEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_ShiftDown", (PyCFunction) _wrap_MouseEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_CmdDown", (PyCFunction) _wrap_MouseEvent_CmdDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_LeftDown", (PyCFunction) _wrap_MouseEvent_LeftDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_MiddleDown", (PyCFunction) _wrap_MouseEvent_MiddleDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_RightDown", (PyCFunction) _wrap_MouseEvent_RightDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_LeftUp", (PyCFunction) _wrap_MouseEvent_LeftUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_MiddleUp", (PyCFunction) _wrap_MouseEvent_MiddleUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_RightUp", (PyCFunction) _wrap_MouseEvent_RightUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_LeftDClick", (PyCFunction) _wrap_MouseEvent_LeftDClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_MiddleDClick", (PyCFunction) _wrap_MouseEvent_MiddleDClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_RightDClick", (PyCFunction) _wrap_MouseEvent_RightDClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_LeftIsDown", (PyCFunction) _wrap_MouseEvent_LeftIsDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_MiddleIsDown", (PyCFunction) _wrap_MouseEvent_MiddleIsDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_RightIsDown", (PyCFunction) _wrap_MouseEvent_RightIsDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_Dragging", (PyCFunction) _wrap_MouseEvent_Dragging, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_Moving", (PyCFunction) _wrap_MouseEvent_Moving, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_Entering", (PyCFunction) _wrap_MouseEvent_Entering, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_Leaving", (PyCFunction) _wrap_MouseEvent_Leaving, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetPosition", (PyCFunction) _wrap_MouseEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetPositionTuple", (PyCFunction) _wrap_MouseEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetLogicalPosition", (PyCFunction) _wrap_MouseEvent_GetLogicalPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetX", (PyCFunction) _wrap_MouseEvent_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetY", (PyCFunction) _wrap_MouseEvent_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetWheelRotation", (PyCFunction) _wrap_MouseEvent_GetWheelRotation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetWheelDelta", (PyCFunction) _wrap_MouseEvent_GetWheelDelta, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_GetLinesPerAction", (PyCFunction) _wrap_MouseEvent_GetLinesPerAction, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_IsPageScroll", (PyCFunction) _wrap_MouseEvent_IsPageScroll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_x_set", (PyCFunction) _wrap_MouseEvent_m_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_x_get", (PyCFunction) _wrap_MouseEvent_m_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_y_set", (PyCFunction) _wrap_MouseEvent_m_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_y_get", (PyCFunction) _wrap_MouseEvent_m_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_leftDown_set", (PyCFunction) _wrap_MouseEvent_m_leftDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_leftDown_get", (PyCFunction) _wrap_MouseEvent_m_leftDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_middleDown_set", (PyCFunction) _wrap_MouseEvent_m_middleDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_middleDown_get", (PyCFunction) _wrap_MouseEvent_m_middleDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_rightDown_set", (PyCFunction) _wrap_MouseEvent_m_rightDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_rightDown_get", (PyCFunction) _wrap_MouseEvent_m_rightDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_controlDown_set", (PyCFunction) _wrap_MouseEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_controlDown_get", (PyCFunction) _wrap_MouseEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_shiftDown_set", (PyCFunction) _wrap_MouseEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_shiftDown_get", (PyCFunction) _wrap_MouseEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_altDown_set", (PyCFunction) _wrap_MouseEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_altDown_get", (PyCFunction) _wrap_MouseEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_metaDown_set", (PyCFunction) _wrap_MouseEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_metaDown_get", (PyCFunction) _wrap_MouseEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_wheelRotation_set", (PyCFunction) _wrap_MouseEvent_m_wheelRotation_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_wheelRotation_get", (PyCFunction) _wrap_MouseEvent_m_wheelRotation_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_wheelDelta_set", (PyCFunction) _wrap_MouseEvent_m_wheelDelta_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_wheelDelta_get", (PyCFunction) _wrap_MouseEvent_m_wheelDelta_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_linesPerAction_set", (PyCFunction) _wrap_MouseEvent_m_linesPerAction_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_m_linesPerAction_get", (PyCFunction) _wrap_MouseEvent_m_linesPerAction_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseEvent_swigregister", MouseEvent_swigregister, METH_VARARGS },
-        { (char *)"new_SetCursorEvent", (PyCFunction) _wrap_new_SetCursorEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursorEvent_GetX", (PyCFunction) _wrap_SetCursorEvent_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursorEvent_GetY", (PyCFunction) _wrap_SetCursorEvent_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursorEvent_SetCursor", (PyCFunction) _wrap_SetCursorEvent_SetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursorEvent_GetCursor", (PyCFunction) _wrap_SetCursorEvent_GetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursorEvent_HasCursor", (PyCFunction) _wrap_SetCursorEvent_HasCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursorEvent_swigregister", SetCursorEvent_swigregister, METH_VARARGS },
-        { (char *)"new_KeyEvent", (PyCFunction) _wrap_new_KeyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_ControlDown", (PyCFunction) _wrap_KeyEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_MetaDown", (PyCFunction) _wrap_KeyEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_AltDown", (PyCFunction) _wrap_KeyEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_ShiftDown", (PyCFunction) _wrap_KeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_CmdDown", (PyCFunction) _wrap_KeyEvent_CmdDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_HasModifiers", (PyCFunction) _wrap_KeyEvent_HasModifiers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetKeyCode", (PyCFunction) _wrap_KeyEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetUnicodeKey", (PyCFunction) _wrap_KeyEvent_GetUnicodeKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetRawKeyCode", (PyCFunction) _wrap_KeyEvent_GetRawKeyCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetRawKeyFlags", (PyCFunction) _wrap_KeyEvent_GetRawKeyFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetPosition", (PyCFunction) _wrap_KeyEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetPositionTuple", (PyCFunction) _wrap_KeyEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetX", (PyCFunction) _wrap_KeyEvent_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_GetY", (PyCFunction) _wrap_KeyEvent_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_x_set", (PyCFunction) _wrap_KeyEvent_m_x_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_x_get", (PyCFunction) _wrap_KeyEvent_m_x_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_y_set", (PyCFunction) _wrap_KeyEvent_m_y_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_y_get", (PyCFunction) _wrap_KeyEvent_m_y_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_keyCode_set", (PyCFunction) _wrap_KeyEvent_m_keyCode_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_keyCode_get", (PyCFunction) _wrap_KeyEvent_m_keyCode_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_controlDown_set", (PyCFunction) _wrap_KeyEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_controlDown_get", (PyCFunction) _wrap_KeyEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_shiftDown_set", (PyCFunction) _wrap_KeyEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_shiftDown_get", (PyCFunction) _wrap_KeyEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_altDown_set", (PyCFunction) _wrap_KeyEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_altDown_get", (PyCFunction) _wrap_KeyEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_metaDown_set", (PyCFunction) _wrap_KeyEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_metaDown_get", (PyCFunction) _wrap_KeyEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_scanCode_set", (PyCFunction) _wrap_KeyEvent_m_scanCode_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_scanCode_get", (PyCFunction) _wrap_KeyEvent_m_scanCode_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_rawCode_set", (PyCFunction) _wrap_KeyEvent_m_rawCode_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_rawCode_get", (PyCFunction) _wrap_KeyEvent_m_rawCode_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_rawFlags_set", (PyCFunction) _wrap_KeyEvent_m_rawFlags_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_m_rawFlags_get", (PyCFunction) _wrap_KeyEvent_m_rawFlags_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"KeyEvent_swigregister", KeyEvent_swigregister, METH_VARARGS },
-        { (char *)"new_SizeEvent", (PyCFunction) _wrap_new_SizeEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_GetSize", (PyCFunction) _wrap_SizeEvent_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_GetRect", (PyCFunction) _wrap_SizeEvent_GetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_SetRect", (PyCFunction) _wrap_SizeEvent_SetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_SetSize", (PyCFunction) _wrap_SizeEvent_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_m_size_set", (PyCFunction) _wrap_SizeEvent_m_size_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_m_size_get", (PyCFunction) _wrap_SizeEvent_m_size_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_m_rect_set", (PyCFunction) _wrap_SizeEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_m_rect_get", (PyCFunction) _wrap_SizeEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizeEvent_swigregister", SizeEvent_swigregister, METH_VARARGS },
-        { (char *)"new_MoveEvent", (PyCFunction) _wrap_new_MoveEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_GetPosition", (PyCFunction) _wrap_MoveEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_GetRect", (PyCFunction) _wrap_MoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_SetRect", (PyCFunction) _wrap_MoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_SetPosition", (PyCFunction) _wrap_MoveEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_m_pos_set", (PyCFunction) _wrap_MoveEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_m_pos_get", (PyCFunction) _wrap_MoveEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_m_rect_set", (PyCFunction) _wrap_MoveEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_m_rect_get", (PyCFunction) _wrap_MoveEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MoveEvent_swigregister", MoveEvent_swigregister, METH_VARARGS },
-        { (char *)"new_PaintEvent", (PyCFunction) _wrap_new_PaintEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PaintEvent_swigregister", PaintEvent_swigregister, METH_VARARGS },
-        { (char *)"new_NcPaintEvent", (PyCFunction) _wrap_new_NcPaintEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NcPaintEvent_swigregister", NcPaintEvent_swigregister, METH_VARARGS },
-        { (char *)"new_EraseEvent", (PyCFunction) _wrap_new_EraseEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EraseEvent_GetDC", (PyCFunction) _wrap_EraseEvent_GetDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EraseEvent_swigregister", EraseEvent_swigregister, METH_VARARGS },
-        { (char *)"new_FocusEvent", (PyCFunction) _wrap_new_FocusEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FocusEvent_GetWindow", (PyCFunction) _wrap_FocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FocusEvent_SetWindow", (PyCFunction) _wrap_FocusEvent_SetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FocusEvent_swigregister", FocusEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ChildFocusEvent", (PyCFunction) _wrap_new_ChildFocusEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ChildFocusEvent_GetWindow", (PyCFunction) _wrap_ChildFocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ChildFocusEvent_swigregister", ChildFocusEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ActivateEvent", (PyCFunction) _wrap_new_ActivateEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ActivateEvent_GetActive", (PyCFunction) _wrap_ActivateEvent_GetActive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ActivateEvent_swigregister", ActivateEvent_swigregister, METH_VARARGS },
-        { (char *)"new_InitDialogEvent", (PyCFunction) _wrap_new_InitDialogEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"InitDialogEvent_swigregister", InitDialogEvent_swigregister, METH_VARARGS },
-        { (char *)"new_MenuEvent", (PyCFunction) _wrap_new_MenuEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuEvent_GetMenuId", (PyCFunction) _wrap_MenuEvent_GetMenuId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuEvent_IsPopup", (PyCFunction) _wrap_MenuEvent_IsPopup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuEvent_GetMenu", (PyCFunction) _wrap_MenuEvent_GetMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuEvent_swigregister", MenuEvent_swigregister, METH_VARARGS },
-        { (char *)"new_CloseEvent", (PyCFunction) _wrap_new_CloseEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_SetLoggingOff", (PyCFunction) _wrap_CloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_GetLoggingOff", (PyCFunction) _wrap_CloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_Veto", (PyCFunction) _wrap_CloseEvent_Veto, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_SetCanVeto", (PyCFunction) _wrap_CloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_CanVeto", (PyCFunction) _wrap_CloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CloseEvent_swigregister", CloseEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShowEvent_GetShow", (PyCFunction) _wrap_ShowEvent_GetShow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ShowEvent_swigregister", ShowEvent_swigregister, METH_VARARGS },
-        { (char *)"new_IconizeEvent", (PyCFunction) _wrap_new_IconizeEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconizeEvent_Iconized", (PyCFunction) _wrap_IconizeEvent_Iconized, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconizeEvent_swigregister", IconizeEvent_swigregister, METH_VARARGS },
-        { (char *)"new_MaximizeEvent", (PyCFunction) _wrap_new_MaximizeEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MaximizeEvent_swigregister", MaximizeEvent_swigregister, METH_VARARGS },
-        { (char *)"DropFilesEvent_GetPosition", (PyCFunction) _wrap_DropFilesEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropFilesEvent_GetNumberOfFiles", (PyCFunction) _wrap_DropFilesEvent_GetNumberOfFiles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropFilesEvent_GetFiles", (PyCFunction) _wrap_DropFilesEvent_GetFiles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropFilesEvent_swigregister", DropFilesEvent_swigregister, METH_VARARGS },
-        { (char *)"new_UpdateUIEvent", (PyCFunction) _wrap_new_UpdateUIEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetChecked", (PyCFunction) _wrap_UpdateUIEvent_GetChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetEnabled", (PyCFunction) _wrap_UpdateUIEvent_GetEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetText", (PyCFunction) _wrap_UpdateUIEvent_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetSetText", (PyCFunction) _wrap_UpdateUIEvent_GetSetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetSetChecked", (PyCFunction) _wrap_UpdateUIEvent_GetSetChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetSetEnabled", (PyCFunction) _wrap_UpdateUIEvent_GetSetEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_Check", (PyCFunction) _wrap_UpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_Enable", (PyCFunction) _wrap_UpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_SetText", (PyCFunction) _wrap_UpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_SetUpdateInterval", (PyCFunction) _wrap_UpdateUIEvent_SetUpdateInterval, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetUpdateInterval", (PyCFunction) _wrap_UpdateUIEvent_GetUpdateInterval, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_CanUpdate", (PyCFunction) _wrap_UpdateUIEvent_CanUpdate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_ResetUpdateTime", (PyCFunction) _wrap_UpdateUIEvent_ResetUpdateTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_SetMode", (PyCFunction) _wrap_UpdateUIEvent_SetMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_GetMode", (PyCFunction) _wrap_UpdateUIEvent_GetMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"UpdateUIEvent_swigregister", UpdateUIEvent_swigregister, METH_VARARGS },
-        { (char *)"new_SysColourChangedEvent", (PyCFunction) _wrap_new_SysColourChangedEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SysColourChangedEvent_swigregister", SysColourChangedEvent_swigregister, METH_VARARGS },
-        { (char *)"new_MouseCaptureChangedEvent", (PyCFunction) _wrap_new_MouseCaptureChangedEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseCaptureChangedEvent_GetCapturedWindow", (PyCFunction) _wrap_MouseCaptureChangedEvent_GetCapturedWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MouseCaptureChangedEvent_swigregister", MouseCaptureChangedEvent_swigregister, METH_VARARGS },
-        { (char *)"new_DisplayChangedEvent", (PyCFunction) _wrap_new_DisplayChangedEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DisplayChangedEvent_swigregister", DisplayChangedEvent_swigregister, METH_VARARGS },
-        { (char *)"new_PaletteChangedEvent", (PyCFunction) _wrap_new_PaletteChangedEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PaletteChangedEvent_SetChangedWindow", (PyCFunction) _wrap_PaletteChangedEvent_SetChangedWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PaletteChangedEvent_GetChangedWindow", (PyCFunction) _wrap_PaletteChangedEvent_GetChangedWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PaletteChangedEvent_swigregister", PaletteChangedEvent_swigregister, METH_VARARGS },
-        { (char *)"new_QueryNewPaletteEvent", (PyCFunction) _wrap_new_QueryNewPaletteEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryNewPaletteEvent_SetPaletteRealized", (PyCFunction) _wrap_QueryNewPaletteEvent_SetPaletteRealized, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryNewPaletteEvent_GetPaletteRealized", (PyCFunction) _wrap_QueryNewPaletteEvent_GetPaletteRealized, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryNewPaletteEvent_swigregister", QueryNewPaletteEvent_swigregister, METH_VARARGS },
-        { (char *)"new_NavigationKeyEvent", (PyCFunction) _wrap_new_NavigationKeyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_GetDirection", (PyCFunction) _wrap_NavigationKeyEvent_GetDirection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_SetDirection", (PyCFunction) _wrap_NavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_SetFlags", (PyCFunction) _wrap_NavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NavigationKeyEvent_swigregister", NavigationKeyEvent_swigregister, METH_VARARGS },
-        { (char *)"new_WindowCreateEvent", (PyCFunction) _wrap_new_WindowCreateEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WindowCreateEvent_GetWindow", (PyCFunction) _wrap_WindowCreateEvent_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WindowCreateEvent_swigregister", WindowCreateEvent_swigregister, METH_VARARGS },
-        { (char *)"new_WindowDestroyEvent", (PyCFunction) _wrap_new_WindowDestroyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WindowDestroyEvent_GetWindow", (PyCFunction) _wrap_WindowDestroyEvent_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WindowDestroyEvent_swigregister", WindowDestroyEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ContextMenuEvent", (PyCFunction) _wrap_new_ContextMenuEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextMenuEvent_GetPosition", (PyCFunction) _wrap_ContextMenuEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextMenuEvent_SetPosition", (PyCFunction) _wrap_ContextMenuEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ContextMenuEvent_swigregister", ContextMenuEvent_swigregister, METH_VARARGS },
-        { (char *)"new_IdleEvent", (PyCFunction) _wrap_new_IdleEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IdleEvent_RequestMore", (PyCFunction) _wrap_IdleEvent_RequestMore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IdleEvent_MoreRequested", (PyCFunction) _wrap_IdleEvent_MoreRequested, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IdleEvent_SetMode", (PyCFunction) _wrap_IdleEvent_SetMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IdleEvent_GetMode", (PyCFunction) _wrap_IdleEvent_GetMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IdleEvent_CanSend", (PyCFunction) _wrap_IdleEvent_CanSend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IdleEvent_swigregister", IdleEvent_swigregister, METH_VARARGS },
-        { (char *)"new_PyEvent", (PyCFunction) _wrap_new_PyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PyEvent", (PyCFunction) _wrap_delete_PyEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEvent_SetSelf", (PyCFunction) _wrap_PyEvent_SetSelf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEvent_GetSelf", (PyCFunction) _wrap_PyEvent_GetSelf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyEvent_swigregister", PyEvent_swigregister, METH_VARARGS },
-        { (char *)"new_PyCommandEvent", (PyCFunction) _wrap_new_PyCommandEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PyCommandEvent", (PyCFunction) _wrap_delete_PyCommandEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCommandEvent_SetSelf", (PyCFunction) _wrap_PyCommandEvent_SetSelf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCommandEvent_GetSelf", (PyCFunction) _wrap_PyCommandEvent_GetSelf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyCommandEvent_swigregister", PyCommandEvent_swigregister, METH_VARARGS },
-        { (char *)"new_PyApp", (PyCFunction) _wrap_new_PyApp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_PyApp", (PyCFunction) _wrap_delete_PyApp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp__setCallbackInfo", (PyCFunction) _wrap_PyApp__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetAppName", (PyCFunction) _wrap_PyApp_GetAppName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetAppName", (PyCFunction) _wrap_PyApp_SetAppName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetClassName", (PyCFunction) _wrap_PyApp_GetClassName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetClassName", (PyCFunction) _wrap_PyApp_SetClassName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetVendorName", (PyCFunction) _wrap_PyApp_GetVendorName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetVendorName", (PyCFunction) _wrap_PyApp_SetVendorName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetTraits", (PyCFunction) _wrap_PyApp_GetTraits, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_ProcessPendingEvents", (PyCFunction) _wrap_PyApp_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_Yield", (PyCFunction) _wrap_PyApp_Yield, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_WakeUpIdle", (PyCFunction) _wrap_PyApp_WakeUpIdle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_MainLoop", (PyCFunction) _wrap_PyApp_MainLoop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_Exit", (PyCFunction) _wrap_PyApp_Exit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_ExitMainLoop", (PyCFunction) _wrap_PyApp_ExitMainLoop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_Pending", (PyCFunction) _wrap_PyApp_Pending, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_Dispatch", (PyCFunction) _wrap_PyApp_Dispatch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_ProcessIdle", (PyCFunction) _wrap_PyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SendIdleEvents", (PyCFunction) _wrap_PyApp_SendIdleEvents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_IsActive", (PyCFunction) _wrap_PyApp_IsActive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetTopWindow", (PyCFunction) _wrap_PyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetTopWindow", (PyCFunction) _wrap_PyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_PyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetExitOnFrameDelete", (PyCFunction) _wrap_PyApp_GetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetUseBestVisual", (PyCFunction) _wrap_PyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetUseBestVisual", (PyCFunction) _wrap_PyApp_GetUseBestVisual, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetPrintMode", (PyCFunction) _wrap_PyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetPrintMode", (PyCFunction) _wrap_PyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetAssertMode", (PyCFunction) _wrap_PyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_PyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetMacExitMenuItemId", (PyCFunction) _wrap_PyApp_SetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp__BootstrapApp", (PyCFunction) _wrap_PyApp__BootstrapApp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_GetComCtl32Version", (PyCFunction) _wrap_PyApp_GetComCtl32Version, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyApp_swigregister", PyApp_swigregister, METH_VARARGS },
-        { (char *)"Exit", (PyCFunction) _wrap_Exit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Yield", (PyCFunction) _wrap_Yield, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"YieldIfNeeded", (PyCFunction) _wrap_YieldIfNeeded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SafeYield", (PyCFunction) _wrap_SafeYield, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WakeUpIdle", (PyCFunction) _wrap_WakeUpIdle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS },
-        { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS },
-        { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_VisualAttributes", (PyCFunction) _wrap_new_VisualAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_VisualAttributes", (PyCFunction) _wrap_delete_VisualAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_font_set", (PyCFunction) _wrap_VisualAttributes_font_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_font_get", (PyCFunction) _wrap_VisualAttributes_font_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_colFg_set", (PyCFunction) _wrap_VisualAttributes_colFg_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_colFg_get", (PyCFunction) _wrap_VisualAttributes_colFg_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_colBg_set", (PyCFunction) _wrap_VisualAttributes_colBg_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_colBg_get", (PyCFunction) _wrap_VisualAttributes_colBg_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS },
-        { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Close", (PyCFunction) _wrap_Window_Close, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Destroy", (PyCFunction) _wrap_Window_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_DestroyChildren", (PyCFunction) _wrap_Window_DestroyChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsBeingDeleted", (PyCFunction) _wrap_Window_IsBeingDeleted, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetTitle", (PyCFunction) _wrap_Window_SetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetTitle", (PyCFunction) _wrap_Window_GetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetLabel", (PyCFunction) _wrap_Window_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetLabel", (PyCFunction) _wrap_Window_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetName", (PyCFunction) _wrap_Window_SetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetName", (PyCFunction) _wrap_Window_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetWindowVariant", (PyCFunction) _wrap_Window_SetWindowVariant, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetWindowVariant", (PyCFunction) _wrap_Window_GetWindowVariant, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetId", (PyCFunction) _wrap_Window_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetId", (PyCFunction) _wrap_Window_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_NewControlId", (PyCFunction) _wrap_Window_NewControlId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_NextControlId", (PyCFunction) _wrap_Window_NextControlId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PrevControlId", (PyCFunction) _wrap_Window_PrevControlId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetSize", (PyCFunction) _wrap_Window_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetDimensions", (PyCFunction) _wrap_Window_SetDimensions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetRect", (PyCFunction) _wrap_Window_SetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetSizeWH", (PyCFunction) _wrap_Window_SetSizeWH, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Move", (PyCFunction) _wrap_Window_Move, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_MoveXY", (PyCFunction) _wrap_Window_MoveXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetBestFittingSize", (PyCFunction) _wrap_Window_SetBestFittingSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Raise", (PyCFunction) _wrap_Window_Raise, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Lower", (PyCFunction) _wrap_Window_Lower, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetClientSize", (PyCFunction) _wrap_Window_SetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetClientSizeWH", (PyCFunction) _wrap_Window_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetClientRect", (PyCFunction) _wrap_Window_SetClientRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetPosition", (PyCFunction) _wrap_Window_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetPositionTuple", (PyCFunction) _wrap_Window_GetPositionTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetSize", (PyCFunction) _wrap_Window_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetSizeTuple", (PyCFunction) _wrap_Window_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetRect", (PyCFunction) _wrap_Window_GetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetClientSize", (PyCFunction) _wrap_Window_GetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetClientSizeTuple", (PyCFunction) _wrap_Window_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetClientAreaOrigin", (PyCFunction) _wrap_Window_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetClientRect", (PyCFunction) _wrap_Window_GetClientRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBestSize", (PyCFunction) _wrap_Window_GetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBestSizeTuple", (PyCFunction) _wrap_Window_GetBestSizeTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_InvalidateBestSize", (PyCFunction) _wrap_Window_InvalidateBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBestFittingSize", (PyCFunction) _wrap_Window_GetBestFittingSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetAdjustedBestSize", (PyCFunction) _wrap_Window_GetAdjustedBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_CenterOnScreen", (PyCFunction) _wrap_Window_CenterOnScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Fit", (PyCFunction) _wrap_Window_Fit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetSizeHints", (PyCFunction) _wrap_Window_SetSizeHints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetSizeHintsSz", (PyCFunction) _wrap_Window_SetSizeHintsSz, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetVirtualSizeHints", (PyCFunction) _wrap_Window_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetVirtualSizeHintsSz", (PyCFunction) _wrap_Window_SetVirtualSizeHintsSz, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetMinSize", (PyCFunction) _wrap_Window_SetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetMaxSize", (PyCFunction) _wrap_Window_SetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetVirtualSizeTuple", (PyCFunction) _wrap_Window_GetVirtualSizeTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBestVirtualSize", (PyCFunction) _wrap_Window_GetBestVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Show", (PyCFunction) _wrap_Window_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Hide", (PyCFunction) _wrap_Window_Hide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Enable", (PyCFunction) _wrap_Window_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Disable", (PyCFunction) _wrap_Window_Disable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsShown", (PyCFunction) _wrap_Window_IsShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsEnabled", (PyCFunction) _wrap_Window_IsEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetWindowStyleFlag", (PyCFunction) _wrap_Window_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsRetained", (PyCFunction) _wrap_Window_IsRetained, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetExtraStyle", (PyCFunction) _wrap_Window_SetExtraStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetExtraStyle", (PyCFunction) _wrap_Window_GetExtraStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_MakeModal", (PyCFunction) _wrap_Window_MakeModal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetThemeEnabled", (PyCFunction) _wrap_Window_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetThemeEnabled", (PyCFunction) _wrap_Window_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetFocus", (PyCFunction) _wrap_Window_SetFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetFocusFromKbd", (PyCFunction) _wrap_Window_SetFocusFromKbd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_FindFocus", (PyCFunction) _wrap_Window_FindFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_AcceptsFocus", (PyCFunction) _wrap_Window_AcceptsFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_Window_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetDefaultItem", (PyCFunction) _wrap_Window_GetDefaultItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetDefaultItem", (PyCFunction) _wrap_Window_SetDefaultItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetTmpDefaultItem", (PyCFunction) _wrap_Window_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_MoveAfterInTabOrder", (PyCFunction) _wrap_Window_MoveAfterInTabOrder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_MoveBeforeInTabOrder", (PyCFunction) _wrap_Window_MoveBeforeInTabOrder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetChildren", (PyCFunction) _wrap_Window_GetChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetParent", (PyCFunction) _wrap_Window_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetGrandParent", (PyCFunction) _wrap_Window_GetGrandParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsTopLevel", (PyCFunction) _wrap_Window_IsTopLevel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetEventHandler", (PyCFunction) _wrap_Window_GetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetEventHandler", (PyCFunction) _wrap_Window_SetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PushEventHandler", (PyCFunction) _wrap_Window_PushEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PopEventHandler", (PyCFunction) _wrap_Window_PopEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_RemoveEventHandler", (PyCFunction) _wrap_Window_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetValidator", (PyCFunction) _wrap_Window_SetValidator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetValidator", (PyCFunction) _wrap_Window_GetValidator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Validate", (PyCFunction) _wrap_Window_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_TransferDataToWindow", (PyCFunction) _wrap_Window_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_TransferDataFromWindow", (PyCFunction) _wrap_Window_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_InitDialog", (PyCFunction) _wrap_Window_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetAcceleratorTable", (PyCFunction) _wrap_Window_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetAcceleratorTable", (PyCFunction) _wrap_Window_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_RegisterHotKey", (PyCFunction) _wrap_Window_RegisterHotKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_UnregisterHotKey", (PyCFunction) _wrap_Window_UnregisterHotKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ConvertDialogPointToPixels", (PyCFunction) _wrap_Window_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ConvertDialogSizeToPixels", (PyCFunction) _wrap_Window_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_DLG_PNT", (PyCFunction) _wrap_Window_DLG_PNT, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_DLG_SZE", (PyCFunction) _wrap_Window_DLG_SZE, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ConvertPixelPointToDialog", (PyCFunction) _wrap_Window_ConvertPixelPointToDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ConvertPixelSizeToDialog", (PyCFunction) _wrap_Window_ConvertPixelSizeToDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_WarpPointer", (PyCFunction) _wrap_Window_WarpPointer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_CaptureMouse", (PyCFunction) _wrap_Window_CaptureMouse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ReleaseMouse", (PyCFunction) _wrap_Window_ReleaseMouse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetCapture", (PyCFunction) _wrap_Window_GetCapture, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_HasCapture", (PyCFunction) _wrap_Window_HasCapture, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Refresh", (PyCFunction) _wrap_Window_Refresh, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_RefreshRect", (PyCFunction) _wrap_Window_RefreshRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Update", (PyCFunction) _wrap_Window_Update, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ClearBackground", (PyCFunction) _wrap_Window_ClearBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Freeze", (PyCFunction) _wrap_Window_Freeze, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Thaw", (PyCFunction) _wrap_Window_Thaw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PrepareDC", (PyCFunction) _wrap_Window_PrepareDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetUpdateRegion", (PyCFunction) _wrap_Window_GetUpdateRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetUpdateClientRect", (PyCFunction) _wrap_Window_GetUpdateClientRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetOwnBackgroundColour", (PyCFunction) _wrap_Window_SetOwnBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetOwnForegroundColour", (PyCFunction) _wrap_Window_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetBackgroundStyle", (PyCFunction) _wrap_Window_SetBackgroundStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBackgroundStyle", (PyCFunction) _wrap_Window_GetBackgroundStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetOwnFont", (PyCFunction) _wrap_Window_SetOwnFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetCharHeight", (PyCFunction) _wrap_Window_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetCharWidth", (PyCFunction) _wrap_Window_GetCharWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetTextExtent", (PyCFunction) _wrap_Window_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetFullTextExtent", (PyCFunction) _wrap_Window_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ClientToScreenXY", (PyCFunction) _wrap_Window_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ScreenToClientXY", (PyCFunction) _wrap_Window_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ClientToScreen", (PyCFunction) _wrap_Window_ClientToScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ScreenToClient", (PyCFunction) _wrap_Window_ScreenToClient, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_HitTestXY", (PyCFunction) _wrap_Window_HitTestXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_HitTest", (PyCFunction) _wrap_Window_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetBorder", _wrap_Window_GetBorder, METH_VARARGS },
-        { (char *)"Window_UpdateWindowUI", (PyCFunction) _wrap_Window_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PopupMenuXY", (PyCFunction) _wrap_Window_PopupMenuXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PopupMenu", (PyCFunction) _wrap_Window_PopupMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetHandle", (PyCFunction) _wrap_Window_GetHandle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_HasScrollbar", (PyCFunction) _wrap_Window_HasScrollbar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetScrollbar", (PyCFunction) _wrap_Window_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetScrollPos", (PyCFunction) _wrap_Window_SetScrollPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetScrollPos", (PyCFunction) _wrap_Window_GetScrollPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetScrollThumb", (PyCFunction) _wrap_Window_GetScrollThumb, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetScrollRange", (PyCFunction) _wrap_Window_GetScrollRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ScrollWindow", (PyCFunction) _wrap_Window_ScrollWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ScrollLines", (PyCFunction) _wrap_Window_ScrollLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ScrollPages", (PyCFunction) _wrap_Window_ScrollPages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_LineUp", (PyCFunction) _wrap_Window_LineUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_LineDown", (PyCFunction) _wrap_Window_LineDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PageUp", (PyCFunction) _wrap_Window_PageUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_PageDown", (PyCFunction) _wrap_Window_PageDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetHelpText", (PyCFunction) _wrap_Window_SetHelpText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetHelpTextForId", (PyCFunction) _wrap_Window_SetHelpTextForId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetHelpText", (PyCFunction) _wrap_Window_GetHelpText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetToolTipString", (PyCFunction) _wrap_Window_SetToolTipString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetToolTip", (PyCFunction) _wrap_Window_SetToolTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetToolTip", (PyCFunction) _wrap_Window_GetToolTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetDropTarget", (PyCFunction) _wrap_Window_SetDropTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetDropTarget", (PyCFunction) _wrap_Window_GetDropTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetConstraints", (PyCFunction) _wrap_Window_SetConstraints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetConstraints", (PyCFunction) _wrap_Window_GetConstraints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetAutoLayout", (PyCFunction) _wrap_Window_SetAutoLayout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetAutoLayout", (PyCFunction) _wrap_Window_GetAutoLayout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_Layout", (PyCFunction) _wrap_Window_Layout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetSizer", (PyCFunction) _wrap_Window_SetSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetSizerAndFit", (PyCFunction) _wrap_Window_SetSizerAndFit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetSizer", (PyCFunction) _wrap_Window_GetSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_SetContainingSizer", (PyCFunction) _wrap_Window_SetContainingSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_GetContainingSizer", (PyCFunction) _wrap_Window_GetContainingSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_InheritAttributes", (PyCFunction) _wrap_Window_InheritAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_ShouldInheritColours", (PyCFunction) _wrap_Window_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_swigregister", Window_swigregister, METH_VARARGS },
-        { (char *)"FindWindowById", (PyCFunction) _wrap_FindWindowById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindWindowByName", (PyCFunction) _wrap_FindWindowByName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindWindowByLabel", (PyCFunction) _wrap_FindWindowByLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Window_FromHWND", (PyCFunction) _wrap_Window_FromHWND, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Validator", (PyCFunction) _wrap_new_Validator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_Clone", (PyCFunction) _wrap_Validator_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_Validate", (PyCFunction) _wrap_Validator_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_TransferToWindow", (PyCFunction) _wrap_Validator_TransferToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_TransferFromWindow", (PyCFunction) _wrap_Validator_TransferFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_GetWindow", (PyCFunction) _wrap_Validator_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_SetWindow", (PyCFunction) _wrap_Validator_SetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_IsSilent", (PyCFunction) _wrap_Validator_IsSilent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_SetBellOnError", (PyCFunction) _wrap_Validator_SetBellOnError, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Validator_swigregister", Validator_swigregister, METH_VARARGS },
-        { (char *)"new_PyValidator", (PyCFunction) _wrap_new_PyValidator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyValidator__setCallbackInfo", (PyCFunction) _wrap_PyValidator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyValidator_swigregister", PyValidator_swigregister, METH_VARARGS },
-        { (char *)"new_Menu", (PyCFunction) _wrap_new_Menu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Append", (PyCFunction) _wrap_Menu_Append, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_AppendSeparator", (PyCFunction) _wrap_Menu_AppendSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_AppendCheckItem", (PyCFunction) _wrap_Menu_AppendCheckItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_AppendRadioItem", (PyCFunction) _wrap_Menu_AppendRadioItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_AppendMenu", (PyCFunction) _wrap_Menu_AppendMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_AppendItem", (PyCFunction) _wrap_Menu_AppendItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Break", (PyCFunction) _wrap_Menu_Break, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_InsertItem", (PyCFunction) _wrap_Menu_InsertItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Insert", (PyCFunction) _wrap_Menu_Insert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_InsertSeparator", (PyCFunction) _wrap_Menu_InsertSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_InsertCheckItem", (PyCFunction) _wrap_Menu_InsertCheckItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_InsertRadioItem", (PyCFunction) _wrap_Menu_InsertRadioItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_InsertMenu", (PyCFunction) _wrap_Menu_InsertMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_PrependItem", (PyCFunction) _wrap_Menu_PrependItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Prepend", (PyCFunction) _wrap_Menu_Prepend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_PrependSeparator", (PyCFunction) _wrap_Menu_PrependSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_PrependCheckItem", (PyCFunction) _wrap_Menu_PrependCheckItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_PrependRadioItem", (PyCFunction) _wrap_Menu_PrependRadioItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_PrependMenu", (PyCFunction) _wrap_Menu_PrependMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Remove", (PyCFunction) _wrap_Menu_Remove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_RemoveItem", (PyCFunction) _wrap_Menu_RemoveItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Delete", (PyCFunction) _wrap_Menu_Delete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_DeleteItem", (PyCFunction) _wrap_Menu_DeleteItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Destroy", (PyCFunction) _wrap_Menu_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_DestroyId", (PyCFunction) _wrap_Menu_DestroyId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_DestroyItem", (PyCFunction) _wrap_Menu_DestroyItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetMenuItemCount", (PyCFunction) _wrap_Menu_GetMenuItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetMenuItems", (PyCFunction) _wrap_Menu_GetMenuItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_FindItem", (PyCFunction) _wrap_Menu_FindItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_FindItemById", (PyCFunction) _wrap_Menu_FindItemById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_FindItemByPosition", (PyCFunction) _wrap_Menu_FindItemByPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Enable", (PyCFunction) _wrap_Menu_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_IsEnabled", (PyCFunction) _wrap_Menu_IsEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Check", (PyCFunction) _wrap_Menu_Check, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_IsChecked", (PyCFunction) _wrap_Menu_IsChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_SetLabel", (PyCFunction) _wrap_Menu_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetLabel", (PyCFunction) _wrap_Menu_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_SetHelpString", (PyCFunction) _wrap_Menu_SetHelpString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetHelpString", (PyCFunction) _wrap_Menu_GetHelpString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_SetTitle", (PyCFunction) _wrap_Menu_SetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetTitle", (PyCFunction) _wrap_Menu_GetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_SetEventHandler", (PyCFunction) _wrap_Menu_SetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetEventHandler", (PyCFunction) _wrap_Menu_GetEventHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_SetInvokingWindow", (PyCFunction) _wrap_Menu_SetInvokingWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetInvokingWindow", (PyCFunction) _wrap_Menu_GetInvokingWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetStyle", (PyCFunction) _wrap_Menu_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_UpdateUI", (PyCFunction) _wrap_Menu_UpdateUI, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetMenuBar", (PyCFunction) _wrap_Menu_GetMenuBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Attach", (PyCFunction) _wrap_Menu_Attach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_Detach", (PyCFunction) _wrap_Menu_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_IsAttached", (PyCFunction) _wrap_Menu_IsAttached, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_SetParent", (PyCFunction) _wrap_Menu_SetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_GetParent", (PyCFunction) _wrap_Menu_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Menu_swigregister", Menu_swigregister, METH_VARARGS },
-        { (char *)"new_MenuBar", (PyCFunction) _wrap_new_MenuBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Append", (PyCFunction) _wrap_MenuBar_Append, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Insert", (PyCFunction) _wrap_MenuBar_Insert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_GetMenuCount", (PyCFunction) _wrap_MenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_GetMenu", (PyCFunction) _wrap_MenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Replace", (PyCFunction) _wrap_MenuBar_Replace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Remove", (PyCFunction) _wrap_MenuBar_Remove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_EnableTop", (PyCFunction) _wrap_MenuBar_EnableTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_IsEnabledTop", (PyCFunction) _wrap_MenuBar_IsEnabledTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_SetLabelTop", (PyCFunction) _wrap_MenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_GetLabelTop", (PyCFunction) _wrap_MenuBar_GetLabelTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_FindMenuItem", (PyCFunction) _wrap_MenuBar_FindMenuItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_FindItemById", (PyCFunction) _wrap_MenuBar_FindItemById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_FindMenu", (PyCFunction) _wrap_MenuBar_FindMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Enable", (PyCFunction) _wrap_MenuBar_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Check", (PyCFunction) _wrap_MenuBar_Check, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_IsChecked", (PyCFunction) _wrap_MenuBar_IsChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_IsEnabled", (PyCFunction) _wrap_MenuBar_IsEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_SetLabel", (PyCFunction) _wrap_MenuBar_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_GetLabel", (PyCFunction) _wrap_MenuBar_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_SetHelpString", (PyCFunction) _wrap_MenuBar_SetHelpString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_GetHelpString", (PyCFunction) _wrap_MenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_GetFrame", (PyCFunction) _wrap_MenuBar_GetFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_IsAttached", (PyCFunction) _wrap_MenuBar_IsAttached, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Attach", (PyCFunction) _wrap_MenuBar_Attach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_Detach", (PyCFunction) _wrap_MenuBar_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuBar_swigregister", MenuBar_swigregister, METH_VARARGS },
-        { (char *)"new_MenuItem", (PyCFunction) _wrap_new_MenuItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetMenu", (PyCFunction) _wrap_MenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetMenu", (PyCFunction) _wrap_MenuItem_SetMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetId", (PyCFunction) _wrap_MenuItem_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetId", (PyCFunction) _wrap_MenuItem_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_IsSeparator", (PyCFunction) _wrap_MenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetText", (PyCFunction) _wrap_MenuItem_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetLabel", (PyCFunction) _wrap_MenuItem_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetText", (PyCFunction) _wrap_MenuItem_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetLabelFromText", (PyCFunction) _wrap_MenuItem_GetLabelFromText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetKind", (PyCFunction) _wrap_MenuItem_GetKind, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetKind", (PyCFunction) _wrap_MenuItem_SetKind, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetCheckable", (PyCFunction) _wrap_MenuItem_SetCheckable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_IsCheckable", (PyCFunction) _wrap_MenuItem_IsCheckable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_IsSubMenu", (PyCFunction) _wrap_MenuItem_IsSubMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetSubMenu", (PyCFunction) _wrap_MenuItem_SetSubMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetSubMenu", (PyCFunction) _wrap_MenuItem_GetSubMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_Enable", (PyCFunction) _wrap_MenuItem_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_IsEnabled", (PyCFunction) _wrap_MenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_Check", (PyCFunction) _wrap_MenuItem_Check, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_IsChecked", (PyCFunction) _wrap_MenuItem_IsChecked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_Toggle", (PyCFunction) _wrap_MenuItem_Toggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetHelp", (PyCFunction) _wrap_MenuItem_SetHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetHelp", (PyCFunction) _wrap_MenuItem_GetHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetAccel", (PyCFunction) _wrap_MenuItem_GetAccel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetAccel", (PyCFunction) _wrap_MenuItem_SetAccel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetDefaultMarginWidth", (PyCFunction) _wrap_MenuItem_GetDefaultMarginWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_SetBitmap", (PyCFunction) _wrap_MenuItem_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_GetBitmap", (PyCFunction) _wrap_MenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MenuItem_swigregister", MenuItem_swigregister, METH_VARARGS },
-        { (char *)"new_Control", (PyCFunction) _wrap_new_Control, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreControl", (PyCFunction) _wrap_new_PreControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Control_Create", (PyCFunction) _wrap_Control_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Control_GetLabel", (PyCFunction) _wrap_Control_GetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Control_SetLabel", (PyCFunction) _wrap_Control_SetLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS },
-        { (char *)"ItemContainer_Append", (PyCFunction) _wrap_ItemContainer_Append, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_AppendItems", (PyCFunction) _wrap_ItemContainer_AppendItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_Insert", (PyCFunction) _wrap_ItemContainer_Insert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_Clear", (PyCFunction) _wrap_ItemContainer_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_Delete", (PyCFunction) _wrap_ItemContainer_Delete, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_GetCount", (PyCFunction) _wrap_ItemContainer_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_IsEmpty", (PyCFunction) _wrap_ItemContainer_IsEmpty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_GetString", (PyCFunction) _wrap_ItemContainer_GetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_GetStrings", (PyCFunction) _wrap_ItemContainer_GetStrings, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_SetString", (PyCFunction) _wrap_ItemContainer_SetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_FindString", (PyCFunction) _wrap_ItemContainer_FindString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_GetSelection", (PyCFunction) _wrap_ItemContainer_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_GetStringSelection", (PyCFunction) _wrap_ItemContainer_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_GetClientData", (PyCFunction) _wrap_ItemContainer_GetClientData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_SetClientData", (PyCFunction) _wrap_ItemContainer_SetClientData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS },
-        { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS },
-        { (char *)"new_SizerItem", (PyCFunction) _wrap_new_SizerItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_SizerItemSpacer", (PyCFunction) _wrap_new_SizerItemSpacer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_SizerItemSizer", (PyCFunction) _wrap_new_SizerItemSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_DeleteWindows", (PyCFunction) _wrap_SizerItem_DeleteWindows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_DetachSizer", (PyCFunction) _wrap_SizerItem_DetachSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetSize", (PyCFunction) _wrap_SizerItem_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_CalcMin", (PyCFunction) _wrap_SizerItem_CalcMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetDimension", (PyCFunction) _wrap_SizerItem_SetDimension, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetMinSize", (PyCFunction) _wrap_SizerItem_GetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetMinSizeWithBorder", (PyCFunction) _wrap_SizerItem_GetMinSizeWithBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetInitSize", (PyCFunction) _wrap_SizerItem_SetInitSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetRatioWH", (PyCFunction) _wrap_SizerItem_SetRatioWH, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetRatioSize", (PyCFunction) _wrap_SizerItem_SetRatioSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetRatio", (PyCFunction) _wrap_SizerItem_SetRatio, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetRatio", (PyCFunction) _wrap_SizerItem_GetRatio, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_IsWindow", (PyCFunction) _wrap_SizerItem_IsWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_IsSizer", (PyCFunction) _wrap_SizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_IsSpacer", (PyCFunction) _wrap_SizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetProportion", (PyCFunction) _wrap_SizerItem_SetProportion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetProportion", (PyCFunction) _wrap_SizerItem_GetProportion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetFlag", (PyCFunction) _wrap_SizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetFlag", (PyCFunction) _wrap_SizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetBorder", (PyCFunction) _wrap_SizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetBorder", (PyCFunction) _wrap_SizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetWindow", (PyCFunction) _wrap_SizerItem_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetSizer", (PyCFunction) _wrap_SizerItem_GetSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetSpacer", (PyCFunction) _wrap_SizerItem_GetSpacer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_SetSpacer", (PyCFunction) _wrap_SizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_Show", (PyCFunction) _wrap_SizerItem_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_IsShown", (PyCFunction) _wrap_SizerItem_IsShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetPosition", (PyCFunction) _wrap_SizerItem_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_GetUserData", (PyCFunction) _wrap_SizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SizerItem_swigregister", SizerItem_swigregister, METH_VARARGS },
-        { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer__SetItemMinSize", (PyCFunction) _wrap_Sizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_AddItem", (PyCFunction) _wrap_Sizer_AddItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_InsertItem", (PyCFunction) _wrap_Sizer_InsertItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_PrependItem", (PyCFunction) _wrap_Sizer_PrependItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_SetDimension", (PyCFunction) _wrap_Sizer_SetDimension, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_SetMinSize", (PyCFunction) _wrap_Sizer_SetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_GetSize", (PyCFunction) _wrap_Sizer_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_GetPosition", (PyCFunction) _wrap_Sizer_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_GetMinSize", (PyCFunction) _wrap_Sizer_GetMinSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_RecalcSizes", (PyCFunction) _wrap_Sizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_CalcMin", (PyCFunction) _wrap_Sizer_CalcMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Layout", (PyCFunction) _wrap_Sizer_Layout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Fit", (PyCFunction) _wrap_Sizer_Fit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_FitInside", (PyCFunction) _wrap_Sizer_FitInside, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_SetSizeHints", (PyCFunction) _wrap_Sizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_SetVirtualSizeHints", (PyCFunction) _wrap_Sizer_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Clear", (PyCFunction) _wrap_Sizer_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_DeleteWindows", (PyCFunction) _wrap_Sizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_GetChildren", (PyCFunction) _wrap_Sizer_GetChildren, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_Show", (PyCFunction) _wrap_Sizer_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_IsShown", (PyCFunction) _wrap_Sizer_IsShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_ShowItems", (PyCFunction) _wrap_Sizer_ShowItems, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sizer_swigregister", Sizer_swigregister, METH_VARARGS },
-        { (char *)"new_PySizer", (PyCFunction) _wrap_new_PySizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PySizer__setCallbackInfo", (PyCFunction) _wrap_PySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PySizer_swigregister", PySizer_swigregister, METH_VARARGS },
-        { (char *)"new_BoxSizer", (PyCFunction) _wrap_new_BoxSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BoxSizer_GetOrientation", (PyCFunction) _wrap_BoxSizer_GetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BoxSizer_SetOrientation", (PyCFunction) _wrap_BoxSizer_SetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BoxSizer_swigregister", BoxSizer_swigregister, METH_VARARGS },
-        { (char *)"new_StaticBoxSizer", (PyCFunction) _wrap_new_StaticBoxSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBoxSizer_GetStaticBox", (PyCFunction) _wrap_StaticBoxSizer_GetStaticBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StaticBoxSizer_swigregister", StaticBoxSizer_swigregister, METH_VARARGS },
-        { (char *)"new_GridSizer", (PyCFunction) _wrap_new_GridSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_SetCols", (PyCFunction) _wrap_GridSizer_SetCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_SetRows", (PyCFunction) _wrap_GridSizer_SetRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_SetVGap", (PyCFunction) _wrap_GridSizer_SetVGap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_SetHGap", (PyCFunction) _wrap_GridSizer_SetHGap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_GetCols", (PyCFunction) _wrap_GridSizer_GetCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_GetRows", (PyCFunction) _wrap_GridSizer_GetRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_GetVGap", (PyCFunction) _wrap_GridSizer_GetVGap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_GetHGap", (PyCFunction) _wrap_GridSizer_GetHGap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizer_swigregister", GridSizer_swigregister, METH_VARARGS },
-        { (char *)"new_FlexGridSizer", (PyCFunction) _wrap_new_FlexGridSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_AddGrowableRow", (PyCFunction) _wrap_FlexGridSizer_AddGrowableRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_RemoveGrowableRow", (PyCFunction) _wrap_FlexGridSizer_RemoveGrowableRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_AddGrowableCol", (PyCFunction) _wrap_FlexGridSizer_AddGrowableCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_RemoveGrowableCol", (PyCFunction) _wrap_FlexGridSizer_RemoveGrowableCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_SetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_SetFlexibleDirection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_GetRowHeights", (PyCFunction) _wrap_FlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_GetColWidths", (PyCFunction) _wrap_FlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FlexGridSizer_swigregister", FlexGridSizer_swigregister, METH_VARARGS },
-        { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_GetCol", (PyCFunction) _wrap_GBPosition_GetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_SetRow", (PyCFunction) _wrap_GBPosition_SetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_SetCol", (PyCFunction) _wrap_GBPosition_SetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition___eq__", (PyCFunction) _wrap_GBPosition___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition___ne__", (PyCFunction) _wrap_GBPosition___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_Set", (PyCFunction) _wrap_GBPosition_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS },
-        { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_GetColspan", (PyCFunction) _wrap_GBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_SetRowspan", (PyCFunction) _wrap_GBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_SetColspan", (PyCFunction) _wrap_GBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan___eq__", (PyCFunction) _wrap_GBSpan___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan___ne__", (PyCFunction) _wrap_GBSpan___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_Set", (PyCFunction) _wrap_GBSpan_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS },
-        { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_GBSizerItemSizer", (PyCFunction) _wrap_new_GBSizerItemSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_GBSizerItemSpacer", (PyCFunction) _wrap_new_GBSizerItemSpacer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_GetPos", (PyCFunction) _wrap_GBSizerItem_GetPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_GetSpan", (PyCFunction) _wrap_GBSizerItem_GetSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_SetPos", (PyCFunction) _wrap_GBSizerItem_SetPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_SetSpan", (PyCFunction) _wrap_GBSizerItem_SetSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_Intersects", (PyCFunction) _wrap_GBSizerItem_Intersects, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_IntersectsPos", (PyCFunction) _wrap_GBSizerItem_IntersectsPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_GetEndPos", (PyCFunction) _wrap_GBSizerItem_GetEndPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_GetGBSizer", (PyCFunction) _wrap_GBSizerItem_GetGBSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_SetGBSizer", (PyCFunction) _wrap_GBSizerItem_SetGBSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GBSizerItem_swigregister", GBSizerItem_swigregister, METH_VARARGS },
-        { (char *)"new_GridBagSizer", (PyCFunction) _wrap_new_GridBagSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_Add", (PyCFunction) _wrap_GridBagSizer_Add, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_AddItem", (PyCFunction) _wrap_GridBagSizer_AddItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_GetEmptyCellSize", (PyCFunction) _wrap_GridBagSizer_GetEmptyCellSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_SetEmptyCellSize", (PyCFunction) _wrap_GridBagSizer_SetEmptyCellSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_GetItemPosition", _wrap_GridBagSizer_GetItemPosition, METH_VARARGS },
-        { (char *)"GridBagSizer_SetItemPosition", _wrap_GridBagSizer_SetItemPosition, METH_VARARGS },
-        { (char *)"GridBagSizer_GetItemSpan", _wrap_GridBagSizer_GetItemSpan, METH_VARARGS },
-        { (char *)"GridBagSizer_SetItemSpan", _wrap_GridBagSizer_SetItemSpan, METH_VARARGS },
-        { (char *)"GridBagSizer_FindItem", _wrap_GridBagSizer_FindItem, METH_VARARGS },
-        { (char *)"GridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_GridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_GridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_CheckForIntersection", (PyCFunction) _wrap_GridBagSizer_CheckForIntersection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_CheckForIntersectionPos", (PyCFunction) _wrap_GridBagSizer_CheckForIntersectionPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridBagSizer_swigregister", GridBagSizer_swigregister, METH_VARARGS },
-        { (char *)"IndividualLayoutConstraint_Set", (PyCFunction) _wrap_IndividualLayoutConstraint_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_LeftOf", (PyCFunction) _wrap_IndividualLayoutConstraint_LeftOf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_RightOf", (PyCFunction) _wrap_IndividualLayoutConstraint_RightOf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_Above", (PyCFunction) _wrap_IndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_Below", (PyCFunction) _wrap_IndividualLayoutConstraint_Below, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SameAs", (PyCFunction) _wrap_IndividualLayoutConstraint_SameAs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_PercentOf", (PyCFunction) _wrap_IndividualLayoutConstraint_PercentOf, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_Absolute", (PyCFunction) _wrap_IndividualLayoutConstraint_Absolute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_Unconstrained", (PyCFunction) _wrap_IndividualLayoutConstraint_Unconstrained, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_AsIs", (PyCFunction) _wrap_IndividualLayoutConstraint_AsIs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetOtherWindow", (PyCFunction) _wrap_IndividualLayoutConstraint_GetOtherWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetMyEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetMyEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SetEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_SetEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SetValue", (PyCFunction) _wrap_IndividualLayoutConstraint_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetMargin", (PyCFunction) _wrap_IndividualLayoutConstraint_GetMargin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SetMargin", (PyCFunction) _wrap_IndividualLayoutConstraint_SetMargin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetValue", (PyCFunction) _wrap_IndividualLayoutConstraint_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetPercent", (PyCFunction) _wrap_IndividualLayoutConstraint_GetPercent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetOtherEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetOtherEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetDone", (PyCFunction) _wrap_IndividualLayoutConstraint_GetDone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SetDone", (PyCFunction) _wrap_IndividualLayoutConstraint_SetDone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetRelationship", (PyCFunction) _wrap_IndividualLayoutConstraint_GetRelationship, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SetRelationship", (PyCFunction) _wrap_IndividualLayoutConstraint_SetRelationship, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_ResetIfWin", (PyCFunction) _wrap_IndividualLayoutConstraint_ResetIfWin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_SatisfyConstraint", (PyCFunction) _wrap_IndividualLayoutConstraint_SatisfyConstraint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_GetEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IndividualLayoutConstraint_swigregister", IndividualLayoutConstraint_swigregister, METH_VARARGS },
-        { (char *)"LayoutConstraints_left_get", (PyCFunction) _wrap_LayoutConstraints_left_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_top_get", (PyCFunction) _wrap_LayoutConstraints_top_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_right_get", (PyCFunction) _wrap_LayoutConstraints_right_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_bottom_get", (PyCFunction) _wrap_LayoutConstraints_bottom_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_width_get", (PyCFunction) _wrap_LayoutConstraints_width_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_height_get", (PyCFunction) _wrap_LayoutConstraints_height_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_centreX_get", (PyCFunction) _wrap_LayoutConstraints_centreX_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_centreY_get", (PyCFunction) _wrap_LayoutConstraints_centreY_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_LayoutConstraints", (PyCFunction) _wrap_new_LayoutConstraints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_SatisfyConstraints", (PyCFunction) _wrap_LayoutConstraints_SatisfyConstraints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_AreSatisfied", (PyCFunction) _wrap_LayoutConstraints_AreSatisfied, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutConstraints_swigregister", LayoutConstraints_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"_wxPySetDictionary", __wxPySetDictionary, METH_VARARGS, NULL },
+        { (char *)"_wxPyFixStockObjects", __wxPyFixStockObjects, METH_VARARGS, NULL },
+        { (char *)"Object_GetClassName", (PyCFunction) _wrap_Object_GetClassName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Object_Destroy", (PyCFunction) _wrap_Object_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Object_swigregister", Object_swigregister, METH_VARARGS, NULL },
+        { (char *)"Size_width_set", (PyCFunction) _wrap_Size_width_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_width_get", (PyCFunction) _wrap_Size_width_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_height_set", (PyCFunction) _wrap_Size_height_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_height_get", (PyCFunction) _wrap_Size_height_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Size", (PyCFunction) _wrap_new_Size, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Size", (PyCFunction) _wrap_delete_Size, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size___eq__", (PyCFunction) _wrap_Size___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size___ne__", (PyCFunction) _wrap_Size___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size___add__", (PyCFunction) _wrap_Size___add__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size___sub__", (PyCFunction) _wrap_Size___sub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_IncTo", (PyCFunction) _wrap_Size_IncTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_DecTo", (PyCFunction) _wrap_Size_DecTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_Set", (PyCFunction) _wrap_Size_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_SetWidth", (PyCFunction) _wrap_Size_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_SetHeight", (PyCFunction) _wrap_Size_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_GetWidth", (PyCFunction) _wrap_Size_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_GetHeight", (PyCFunction) _wrap_Size_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_IsFullySpecified", (PyCFunction) _wrap_Size_IsFullySpecified, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_SetDefaults", (PyCFunction) _wrap_Size_SetDefaults, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_Get", (PyCFunction) _wrap_Size_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Size_swigregister", Size_swigregister, METH_VARARGS, NULL },
+        { (char *)"RealPoint_x_set", (PyCFunction) _wrap_RealPoint_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint_x_get", (PyCFunction) _wrap_RealPoint_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint_y_set", (PyCFunction) _wrap_RealPoint_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint_y_get", (PyCFunction) _wrap_RealPoint_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_RealPoint", (PyCFunction) _wrap_new_RealPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_RealPoint", (PyCFunction) _wrap_delete_RealPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint___eq__", (PyCFunction) _wrap_RealPoint___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint___ne__", (PyCFunction) _wrap_RealPoint___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint___add__", (PyCFunction) _wrap_RealPoint___add__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint___sub__", (PyCFunction) _wrap_RealPoint___sub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint_Set", (PyCFunction) _wrap_RealPoint_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint_Get", (PyCFunction) _wrap_RealPoint_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RealPoint_swigregister", RealPoint_swigregister, METH_VARARGS, NULL },
+        { (char *)"Point_x_set", (PyCFunction) _wrap_Point_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point_x_get", (PyCFunction) _wrap_Point_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point_y_set", (PyCFunction) _wrap_Point_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point_y_get", (PyCFunction) _wrap_Point_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Point", (PyCFunction) _wrap_new_Point, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Point", (PyCFunction) _wrap_delete_Point, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point___eq__", (PyCFunction) _wrap_Point___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point___ne__", (PyCFunction) _wrap_Point___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point___add__", (PyCFunction) _wrap_Point___add__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point___sub__", (PyCFunction) _wrap_Point___sub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point___iadd__", (PyCFunction) _wrap_Point___iadd__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point___isub__", (PyCFunction) _wrap_Point___isub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point_Set", (PyCFunction) _wrap_Point_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point_Get", (PyCFunction) _wrap_Point_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point_swigregister", Point_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Rect", (PyCFunction) _wrap_new_Rect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_RectPP", (PyCFunction) _wrap_new_RectPP, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_RectPS", (PyCFunction) _wrap_new_RectPS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Rect", (PyCFunction) _wrap_delete_Rect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetX", (PyCFunction) _wrap_Rect_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetX", (PyCFunction) _wrap_Rect_SetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetY", (PyCFunction) _wrap_Rect_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetY", (PyCFunction) _wrap_Rect_SetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetWidth", (PyCFunction) _wrap_Rect_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetWidth", (PyCFunction) _wrap_Rect_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetHeight", (PyCFunction) _wrap_Rect_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetHeight", (PyCFunction) _wrap_Rect_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetPosition", (PyCFunction) _wrap_Rect_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetPosition", (PyCFunction) _wrap_Rect_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetSize", (PyCFunction) _wrap_Rect_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetSize", (PyCFunction) _wrap_Rect_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetTopLeft", (PyCFunction) _wrap_Rect_GetTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetTopLeft", (PyCFunction) _wrap_Rect_SetTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetBottomRight", (PyCFunction) _wrap_Rect_GetBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetBottomRight", (PyCFunction) _wrap_Rect_SetBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetLeft", (PyCFunction) _wrap_Rect_GetLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetTop", (PyCFunction) _wrap_Rect_GetTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetBottom", (PyCFunction) _wrap_Rect_GetBottom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_GetRight", (PyCFunction) _wrap_Rect_GetRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetLeft", (PyCFunction) _wrap_Rect_SetLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetRight", (PyCFunction) _wrap_Rect_SetRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetTop", (PyCFunction) _wrap_Rect_SetTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_SetBottom", (PyCFunction) _wrap_Rect_SetBottom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Inflate", (PyCFunction) _wrap_Rect_Inflate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Deflate", (PyCFunction) _wrap_Rect_Deflate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_OffsetXY", (PyCFunction) _wrap_Rect_OffsetXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Offset", (PyCFunction) _wrap_Rect_Offset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Intersect", (PyCFunction) _wrap_Rect_Intersect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect___add__", (PyCFunction) _wrap_Rect___add__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect___iadd__", (PyCFunction) _wrap_Rect___iadd__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect___eq__", (PyCFunction) _wrap_Rect___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect___ne__", (PyCFunction) _wrap_Rect___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_InsideXY", (PyCFunction) _wrap_Rect_InsideXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Inside", (PyCFunction) _wrap_Rect_Inside, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Intersects", (PyCFunction) _wrap_Rect_Intersects, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_x_set", (PyCFunction) _wrap_Rect_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_x_get", (PyCFunction) _wrap_Rect_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_y_set", (PyCFunction) _wrap_Rect_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_y_get", (PyCFunction) _wrap_Rect_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_width_set", (PyCFunction) _wrap_Rect_width_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_width_get", (PyCFunction) _wrap_Rect_width_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_height_set", (PyCFunction) _wrap_Rect_height_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_height_get", (PyCFunction) _wrap_Rect_height_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Set", (PyCFunction) _wrap_Rect_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_Get", (PyCFunction) _wrap_Rect_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Rect_swigregister", Rect_swigregister, METH_VARARGS, NULL },
+        { (char *)"IntersectRect", (PyCFunction) _wrap_IntersectRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Point2D", (PyCFunction) _wrap_new_Point2D, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Point2DCopy", (PyCFunction) _wrap_new_Point2DCopy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Point2DFromPoint", (PyCFunction) _wrap_new_Point2DFromPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetFloor", (PyCFunction) _wrap_Point2D_GetFloor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetRounded", (PyCFunction) _wrap_Point2D_GetRounded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetVectorLength", (PyCFunction) _wrap_Point2D_GetVectorLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetVectorAngle", (PyCFunction) _wrap_Point2D_GetVectorAngle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_SetVectorLength", (PyCFunction) _wrap_Point2D_SetVectorLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_SetVectorAngle", (PyCFunction) _wrap_Point2D_SetVectorAngle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetDistance", (PyCFunction) _wrap_Point2D_GetDistance, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetDistanceSquare", (PyCFunction) _wrap_Point2D_GetDistanceSquare, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetDotProduct", (PyCFunction) _wrap_Point2D_GetDotProduct, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_GetCrossProduct", (PyCFunction) _wrap_Point2D_GetCrossProduct, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___neg__", (PyCFunction) _wrap_Point2D___neg__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___iadd__", (PyCFunction) _wrap_Point2D___iadd__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___isub__", (PyCFunction) _wrap_Point2D___isub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___imul__", (PyCFunction) _wrap_Point2D___imul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___idiv__", (PyCFunction) _wrap_Point2D___idiv__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___eq__", (PyCFunction) _wrap_Point2D___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D___ne__", (PyCFunction) _wrap_Point2D___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_x_set", (PyCFunction) _wrap_Point2D_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_x_get", (PyCFunction) _wrap_Point2D_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_y_set", (PyCFunction) _wrap_Point2D_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_y_get", (PyCFunction) _wrap_Point2D_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_Set", (PyCFunction) _wrap_Point2D_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_flush", (PyCFunction) _wrap_InputStream_flush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_eof", (PyCFunction) _wrap_InputStream_eof, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_read", (PyCFunction) _wrap_InputStream_read, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_readline", (PyCFunction) _wrap_InputStream_readline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_readlines", (PyCFunction) _wrap_InputStream_readlines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_seek", (PyCFunction) _wrap_InputStream_seek, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_tell", (PyCFunction) _wrap_InputStream_tell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_Peek", (PyCFunction) _wrap_InputStream_Peek, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_GetC", (PyCFunction) _wrap_InputStream_GetC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_LastRead", (PyCFunction) _wrap_InputStream_LastRead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_CanRead", (PyCFunction) _wrap_InputStream_CanRead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_Eof", (PyCFunction) _wrap_InputStream_Eof, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_Ungetch", (PyCFunction) _wrap_InputStream_Ungetch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_SeekI", (PyCFunction) _wrap_InputStream_SeekI, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_TellI", (PyCFunction) _wrap_InputStream_TellI, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InputStream_swigregister", InputStream_swigregister, METH_VARARGS, NULL },
+        { (char *)"OutputStream_write", (PyCFunction) _wrap_OutputStream_write, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"OutputStream_swigregister", OutputStream_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FSFile", (PyCFunction) _wrap_new_FSFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FSFile", (PyCFunction) _wrap_delete_FSFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FSFile_GetStream", (PyCFunction) _wrap_FSFile_GetStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FSFile_GetMimeType", (PyCFunction) _wrap_FSFile_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FSFile_GetLocation", (PyCFunction) _wrap_FSFile_GetLocation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FSFile_GetAnchor", (PyCFunction) _wrap_FSFile_GetAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FSFile_GetModificationTime", (PyCFunction) _wrap_FSFile_GetModificationTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FSFile_swigregister", FSFile_swigregister, METH_VARARGS, NULL },
+        { (char *)"CPPFileSystemHandler_swigregister", CPPFileSystemHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileSystemHandler", (PyCFunction) _wrap_new_FileSystemHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler__setCallbackInfo", (PyCFunction) _wrap_FileSystemHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_CanOpen", (PyCFunction) _wrap_FileSystemHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_OpenFile", (PyCFunction) _wrap_FileSystemHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_FindFirst", (PyCFunction) _wrap_FileSystemHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_FindNext", (PyCFunction) _wrap_FileSystemHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_GetProtocol", (PyCFunction) _wrap_FileSystemHandler_GetProtocol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_GetLeftLocation", (PyCFunction) _wrap_FileSystemHandler_GetLeftLocation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_GetAnchor", (PyCFunction) _wrap_FileSystemHandler_GetAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_GetRightLocation", (PyCFunction) _wrap_FileSystemHandler_GetRightLocation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_GetMimeTypeFromExt", (PyCFunction) _wrap_FileSystemHandler_GetMimeTypeFromExt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystemHandler_swigregister", FileSystemHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileSystem", (PyCFunction) _wrap_new_FileSystem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FileSystem", (PyCFunction) _wrap_delete_FileSystem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_ChangePathTo", (PyCFunction) _wrap_FileSystem_ChangePathTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_GetPath", (PyCFunction) _wrap_FileSystem_GetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_OpenFile", (PyCFunction) _wrap_FileSystem_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_FindFirst", (PyCFunction) _wrap_FileSystem_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_FindNext", (PyCFunction) _wrap_FileSystem_FindNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_AddHandler", (PyCFunction) _wrap_FileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_CleanUpHandlers", (PyCFunction) _wrap_FileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_FileNameToURL", (PyCFunction) _wrap_FileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSystem_swigregister", FileSystem_swigregister, METH_VARARGS, NULL },
+        { (char *)"FileSystem_URLToFileName", (PyCFunction) _wrap_FileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_InternetFSHandler", (PyCFunction) _wrap_new_InternetFSHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InternetFSHandler_CanOpen", (PyCFunction) _wrap_InternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InternetFSHandler_OpenFile", (PyCFunction) _wrap_InternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InternetFSHandler_swigregister", InternetFSHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ZipFSHandler", (PyCFunction) _wrap_new_ZipFSHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ZipFSHandler_CanOpen", (PyCFunction) _wrap_ZipFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ZipFSHandler_OpenFile", (PyCFunction) _wrap_ZipFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ZipFSHandler_FindFirst", (PyCFunction) _wrap_ZipFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ZipFSHandler_FindNext", (PyCFunction) _wrap_ZipFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ZipFSHandler_swigregister", ZipFSHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_MemoryFSHandler", (PyCFunction) _wrap_new_MemoryFSHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryFSHandler_RemoveFile", (PyCFunction) _wrap_MemoryFSHandler_RemoveFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryFSHandler_CanOpen", (PyCFunction) _wrap_MemoryFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryFSHandler_OpenFile", (PyCFunction) _wrap_MemoryFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryFSHandler_FindFirst", (PyCFunction) _wrap_MemoryFSHandler_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryFSHandler_FindNext", (PyCFunction) _wrap_MemoryFSHandler_FindNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryFSHandler_swigregister", MemoryFSHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"ImageHandler_GetName", (PyCFunction) _wrap_ImageHandler_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_GetExtension", (PyCFunction) _wrap_ImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_GetType", (PyCFunction) _wrap_ImageHandler_GetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_GetMimeType", (PyCFunction) _wrap_ImageHandler_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_CanRead", (PyCFunction) _wrap_ImageHandler_CanRead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_SetName", (PyCFunction) _wrap_ImageHandler_SetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_SetExtension", (PyCFunction) _wrap_ImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_SetType", (PyCFunction) _wrap_ImageHandler_SetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_SetMimeType", (PyCFunction) _wrap_ImageHandler_SetMimeType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHandler_swigregister", ImageHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ImageHistogram", (PyCFunction) _wrap_new_ImageHistogram, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHistogram_MakeKey", (PyCFunction) _wrap_ImageHistogram_MakeKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHistogram_FindFirstUnusedColour", (PyCFunction) _wrap_ImageHistogram_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageHistogram_swigregister", ImageHistogram_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Image", (PyCFunction) _wrap_new_Image, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Image", (PyCFunction) _wrap_delete_Image, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ImageFromMime", (PyCFunction) _wrap_new_ImageFromMime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ImageFromStream", (PyCFunction) _wrap_new_ImageFromStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ImageFromStreamMime", (PyCFunction) _wrap_new_ImageFromStreamMime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_EmptyImage", (PyCFunction) _wrap_new_EmptyImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Destroy", (PyCFunction) _wrap_Image_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Scale", (PyCFunction) _wrap_Image_Scale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_ShrinkBy", (PyCFunction) _wrap_Image_ShrinkBy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Rescale", (PyCFunction) _wrap_Image_Rescale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetRGB", (PyCFunction) _wrap_Image_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetRed", (PyCFunction) _wrap_Image_GetRed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetGreen", (PyCFunction) _wrap_Image_GetGreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetBlue", (PyCFunction) _wrap_Image_GetBlue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetAlpha", (PyCFunction) _wrap_Image_SetAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_LoadFile", (PyCFunction) _wrap_Image_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_LoadMimeFile", (PyCFunction) _wrap_Image_LoadMimeFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SaveFile", (PyCFunction) _wrap_Image_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SaveMimeFile", (PyCFunction) _wrap_Image_SaveMimeFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_CanReadStream", (PyCFunction) _wrap_Image_CanReadStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_LoadStream", (PyCFunction) _wrap_Image_LoadStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_LoadMimeStream", (PyCFunction) _wrap_Image_LoadMimeStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Ok", (PyCFunction) _wrap_Image_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetWidth", (PyCFunction) _wrap_Image_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetHeight", (PyCFunction) _wrap_Image_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetSize", (PyCFunction) _wrap_Image_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetSubImage", (PyCFunction) _wrap_Image_GetSubImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Copy", (PyCFunction) _wrap_Image_Copy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Paste", (PyCFunction) _wrap_Image_Paste, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetData", (PyCFunction) _wrap_Image_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetData", (PyCFunction) _wrap_Image_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetDataBuffer", (PyCFunction) _wrap_Image_GetDataBuffer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetDataBuffer", (PyCFunction) _wrap_Image_SetDataBuffer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetAlphaData", (PyCFunction) _wrap_Image_GetAlphaData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetAlphaData", (PyCFunction) _wrap_Image_SetAlphaData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetAlphaBuffer", (PyCFunction) _wrap_Image_GetAlphaBuffer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetAlphaBuffer", (PyCFunction) _wrap_Image_SetAlphaBuffer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetMaskColour", (PyCFunction) _wrap_Image_SetMaskColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetMaskRed", (PyCFunction) _wrap_Image_GetMaskRed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetMaskGreen", (PyCFunction) _wrap_Image_GetMaskGreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetMaskBlue", (PyCFunction) _wrap_Image_GetMaskBlue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetMask", (PyCFunction) _wrap_Image_SetMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_HasMask", (PyCFunction) _wrap_Image_HasMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Rotate", (PyCFunction) _wrap_Image_Rotate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Rotate90", (PyCFunction) _wrap_Image_Rotate90, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Mirror", (PyCFunction) _wrap_Image_Mirror, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_Replace", (PyCFunction) _wrap_Image_Replace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_ConvertToMono", (PyCFunction) _wrap_Image_ConvertToMono, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetOption", (PyCFunction) _wrap_Image_SetOption, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_SetOptionInt", (PyCFunction) _wrap_Image_SetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetOption", (PyCFunction) _wrap_Image_GetOption, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetOptionInt", (PyCFunction) _wrap_Image_GetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_HasOption", (PyCFunction) _wrap_Image_HasOption, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_CountColours", (PyCFunction) _wrap_Image_CountColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_ComputeHistogram", (PyCFunction) _wrap_Image_ComputeHistogram, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_AddHandler", (PyCFunction) _wrap_Image_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_InsertHandler", (PyCFunction) _wrap_Image_InsertHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_RemoveHandler", (PyCFunction) _wrap_Image_RemoveHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_GetImageExtWildcard", (PyCFunction) _wrap_Image_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_ConvertToBitmap", (PyCFunction) _wrap_Image_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_ConvertToMonoBitmap", (PyCFunction) _wrap_Image_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Image_swigregister", Image_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BMPHandler", (PyCFunction) _wrap_new_BMPHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BMPHandler_swigregister", BMPHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ICOHandler", (PyCFunction) _wrap_new_ICOHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ICOHandler_swigregister", ICOHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CURHandler", (PyCFunction) _wrap_new_CURHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CURHandler_swigregister", CURHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ANIHandler", (PyCFunction) _wrap_new_ANIHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ANIHandler_swigregister", ANIHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PNGHandler", (PyCFunction) _wrap_new_PNGHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PNGHandler_swigregister", PNGHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GIFHandler", (PyCFunction) _wrap_new_GIFHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GIFHandler_swigregister", GIFHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PCXHandler", (PyCFunction) _wrap_new_PCXHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PCXHandler_swigregister", PCXHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_JPEGHandler", (PyCFunction) _wrap_new_JPEGHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JPEGHandler_swigregister", JPEGHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PNMHandler", (PyCFunction) _wrap_new_PNMHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PNMHandler_swigregister", PNMHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_XPMHandler", (PyCFunction) _wrap_new_XPMHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"XPMHandler_swigregister", XPMHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TIFFHandler", (PyCFunction) _wrap_new_TIFFHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TIFFHandler_swigregister", TIFFHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"Quantize_Quantize", (PyCFunction) _wrap_Quantize_Quantize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Quantize_swigregister", Quantize_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_EvtHandler", (PyCFunction) _wrap_new_EvtHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_GetNextHandler", (PyCFunction) _wrap_EvtHandler_GetNextHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_GetPreviousHandler", (PyCFunction) _wrap_EvtHandler_GetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_SetNextHandler", (PyCFunction) _wrap_EvtHandler_SetNextHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_SetPreviousHandler", (PyCFunction) _wrap_EvtHandler_SetPreviousHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_GetEvtHandlerEnabled", (PyCFunction) _wrap_EvtHandler_GetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_SetEvtHandlerEnabled", (PyCFunction) _wrap_EvtHandler_SetEvtHandlerEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_ProcessEvent", (PyCFunction) _wrap_EvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_AddPendingEvent", (PyCFunction) _wrap_EvtHandler_AddPendingEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_ProcessPendingEvents", (PyCFunction) _wrap_EvtHandler_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_Connect", (PyCFunction) _wrap_EvtHandler_Connect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_Disconnect", (PyCFunction) _wrap_EvtHandler_Disconnect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler__setOORInfo", (PyCFunction) _wrap_EvtHandler__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EvtHandler_swigregister", EvtHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"NewEventType", (PyCFunction) _wrap_NewEventType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Event", (PyCFunction) _wrap_delete_Event, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_SetEventType", (PyCFunction) _wrap_Event_SetEventType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_GetEventType", (PyCFunction) _wrap_Event_GetEventType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_GetEventObject", (PyCFunction) _wrap_Event_GetEventObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_SetEventObject", (PyCFunction) _wrap_Event_SetEventObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_GetTimestamp", (PyCFunction) _wrap_Event_GetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_SetTimestamp", (PyCFunction) _wrap_Event_SetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_GetId", (PyCFunction) _wrap_Event_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_SetId", (PyCFunction) _wrap_Event_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_IsCommandEvent", (PyCFunction) _wrap_Event_IsCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_Skip", (PyCFunction) _wrap_Event_Skip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_GetSkipped", (PyCFunction) _wrap_Event_GetSkipped, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_ShouldPropagate", (PyCFunction) _wrap_Event_ShouldPropagate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_StopPropagation", (PyCFunction) _wrap_Event_StopPropagation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_ResumePropagation", (PyCFunction) _wrap_Event_ResumePropagation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_Clone", (PyCFunction) _wrap_Event_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Event_swigregister", Event_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PropagationDisabler", (PyCFunction) _wrap_new_PropagationDisabler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_PropagationDisabler", (PyCFunction) _wrap_delete_PropagationDisabler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PropagationDisabler_swigregister", PropagationDisabler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PropagateOnce", (PyCFunction) _wrap_new_PropagateOnce, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_PropagateOnce", (PyCFunction) _wrap_delete_PropagateOnce, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PropagateOnce_swigregister", PropagateOnce_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CommandEvent", (PyCFunction) _wrap_new_CommandEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_GetSelection", (PyCFunction) _wrap_CommandEvent_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_SetString", (PyCFunction) _wrap_CommandEvent_SetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_GetString", (PyCFunction) _wrap_CommandEvent_GetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_IsChecked", (PyCFunction) _wrap_CommandEvent_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_IsSelection", (PyCFunction) _wrap_CommandEvent_IsSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_SetExtraLong", (PyCFunction) _wrap_CommandEvent_SetExtraLong, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_GetExtraLong", (PyCFunction) _wrap_CommandEvent_GetExtraLong, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_SetInt", (PyCFunction) _wrap_CommandEvent_SetInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_GetInt", (PyCFunction) _wrap_CommandEvent_GetInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_Clone", (PyCFunction) _wrap_CommandEvent_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CommandEvent_swigregister", CommandEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_NotifyEvent", (PyCFunction) _wrap_new_NotifyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotifyEvent_Veto", (PyCFunction) _wrap_NotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotifyEvent_Allow", (PyCFunction) _wrap_NotifyEvent_Allow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotifyEvent_IsAllowed", (PyCFunction) _wrap_NotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NotifyEvent_swigregister", NotifyEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ScrollEvent", (PyCFunction) _wrap_new_ScrollEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollEvent_GetOrientation", (PyCFunction) _wrap_ScrollEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollEvent_GetPosition", (PyCFunction) _wrap_ScrollEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollEvent_SetOrientation", (PyCFunction) _wrap_ScrollEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollEvent_SetPosition", (PyCFunction) _wrap_ScrollEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollEvent_swigregister", ScrollEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ScrollWinEvent", (PyCFunction) _wrap_new_ScrollWinEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollWinEvent_GetOrientation", (PyCFunction) _wrap_ScrollWinEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollWinEvent_GetPosition", (PyCFunction) _wrap_ScrollWinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollWinEvent_SetOrientation", (PyCFunction) _wrap_ScrollWinEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollWinEvent_SetPosition", (PyCFunction) _wrap_ScrollWinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrollWinEvent_swigregister", ScrollWinEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MouseEvent", (PyCFunction) _wrap_new_MouseEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_IsButton", (PyCFunction) _wrap_MouseEvent_IsButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_ButtonDown", (PyCFunction) _wrap_MouseEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_ButtonDClick", (PyCFunction) _wrap_MouseEvent_ButtonDClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_ButtonUp", (PyCFunction) _wrap_MouseEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_Button", (PyCFunction) _wrap_MouseEvent_Button, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_ButtonIsDown", (PyCFunction) _wrap_MouseEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetButton", (PyCFunction) _wrap_MouseEvent_GetButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_ControlDown", (PyCFunction) _wrap_MouseEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_MetaDown", (PyCFunction) _wrap_MouseEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_AltDown", (PyCFunction) _wrap_MouseEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_ShiftDown", (PyCFunction) _wrap_MouseEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_CmdDown", (PyCFunction) _wrap_MouseEvent_CmdDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_LeftDown", (PyCFunction) _wrap_MouseEvent_LeftDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_MiddleDown", (PyCFunction) _wrap_MouseEvent_MiddleDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_RightDown", (PyCFunction) _wrap_MouseEvent_RightDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_LeftUp", (PyCFunction) _wrap_MouseEvent_LeftUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_MiddleUp", (PyCFunction) _wrap_MouseEvent_MiddleUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_RightUp", (PyCFunction) _wrap_MouseEvent_RightUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_LeftDClick", (PyCFunction) _wrap_MouseEvent_LeftDClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_MiddleDClick", (PyCFunction) _wrap_MouseEvent_MiddleDClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_RightDClick", (PyCFunction) _wrap_MouseEvent_RightDClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_LeftIsDown", (PyCFunction) _wrap_MouseEvent_LeftIsDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_MiddleIsDown", (PyCFunction) _wrap_MouseEvent_MiddleIsDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_RightIsDown", (PyCFunction) _wrap_MouseEvent_RightIsDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_Dragging", (PyCFunction) _wrap_MouseEvent_Dragging, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_Moving", (PyCFunction) _wrap_MouseEvent_Moving, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_Entering", (PyCFunction) _wrap_MouseEvent_Entering, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_Leaving", (PyCFunction) _wrap_MouseEvent_Leaving, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetPosition", (PyCFunction) _wrap_MouseEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetPositionTuple", (PyCFunction) _wrap_MouseEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetLogicalPosition", (PyCFunction) _wrap_MouseEvent_GetLogicalPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetX", (PyCFunction) _wrap_MouseEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetY", (PyCFunction) _wrap_MouseEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetWheelRotation", (PyCFunction) _wrap_MouseEvent_GetWheelRotation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetWheelDelta", (PyCFunction) _wrap_MouseEvent_GetWheelDelta, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_GetLinesPerAction", (PyCFunction) _wrap_MouseEvent_GetLinesPerAction, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_IsPageScroll", (PyCFunction) _wrap_MouseEvent_IsPageScroll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_x_set", (PyCFunction) _wrap_MouseEvent_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_x_get", (PyCFunction) _wrap_MouseEvent_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_y_set", (PyCFunction) _wrap_MouseEvent_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_y_get", (PyCFunction) _wrap_MouseEvent_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_leftDown_set", (PyCFunction) _wrap_MouseEvent_m_leftDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_leftDown_get", (PyCFunction) _wrap_MouseEvent_m_leftDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_middleDown_set", (PyCFunction) _wrap_MouseEvent_m_middleDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_middleDown_get", (PyCFunction) _wrap_MouseEvent_m_middleDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_rightDown_set", (PyCFunction) _wrap_MouseEvent_m_rightDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_rightDown_get", (PyCFunction) _wrap_MouseEvent_m_rightDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_controlDown_set", (PyCFunction) _wrap_MouseEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_controlDown_get", (PyCFunction) _wrap_MouseEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_shiftDown_set", (PyCFunction) _wrap_MouseEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_shiftDown_get", (PyCFunction) _wrap_MouseEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_altDown_set", (PyCFunction) _wrap_MouseEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_altDown_get", (PyCFunction) _wrap_MouseEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_metaDown_set", (PyCFunction) _wrap_MouseEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_metaDown_get", (PyCFunction) _wrap_MouseEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_wheelRotation_set", (PyCFunction) _wrap_MouseEvent_m_wheelRotation_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_wheelRotation_get", (PyCFunction) _wrap_MouseEvent_m_wheelRotation_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_wheelDelta_set", (PyCFunction) _wrap_MouseEvent_m_wheelDelta_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_wheelDelta_get", (PyCFunction) _wrap_MouseEvent_m_wheelDelta_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_linesPerAction_set", (PyCFunction) _wrap_MouseEvent_m_linesPerAction_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_m_linesPerAction_get", (PyCFunction) _wrap_MouseEvent_m_linesPerAction_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseEvent_swigregister", MouseEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SetCursorEvent", (PyCFunction) _wrap_new_SetCursorEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursorEvent_GetX", (PyCFunction) _wrap_SetCursorEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursorEvent_GetY", (PyCFunction) _wrap_SetCursorEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursorEvent_SetCursor", (PyCFunction) _wrap_SetCursorEvent_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursorEvent_GetCursor", (PyCFunction) _wrap_SetCursorEvent_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursorEvent_HasCursor", (PyCFunction) _wrap_SetCursorEvent_HasCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursorEvent_swigregister", SetCursorEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_KeyEvent", (PyCFunction) _wrap_new_KeyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_ControlDown", (PyCFunction) _wrap_KeyEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_MetaDown", (PyCFunction) _wrap_KeyEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_AltDown", (PyCFunction) _wrap_KeyEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_ShiftDown", (PyCFunction) _wrap_KeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_CmdDown", (PyCFunction) _wrap_KeyEvent_CmdDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_HasModifiers", (PyCFunction) _wrap_KeyEvent_HasModifiers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetKeyCode", (PyCFunction) _wrap_KeyEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetUnicodeKey", (PyCFunction) _wrap_KeyEvent_GetUnicodeKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetRawKeyCode", (PyCFunction) _wrap_KeyEvent_GetRawKeyCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetRawKeyFlags", (PyCFunction) _wrap_KeyEvent_GetRawKeyFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetPosition", (PyCFunction) _wrap_KeyEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetPositionTuple", (PyCFunction) _wrap_KeyEvent_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetX", (PyCFunction) _wrap_KeyEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_GetY", (PyCFunction) _wrap_KeyEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_x_set", (PyCFunction) _wrap_KeyEvent_m_x_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_x_get", (PyCFunction) _wrap_KeyEvent_m_x_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_y_set", (PyCFunction) _wrap_KeyEvent_m_y_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_y_get", (PyCFunction) _wrap_KeyEvent_m_y_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_keyCode_set", (PyCFunction) _wrap_KeyEvent_m_keyCode_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_keyCode_get", (PyCFunction) _wrap_KeyEvent_m_keyCode_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_controlDown_set", (PyCFunction) _wrap_KeyEvent_m_controlDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_controlDown_get", (PyCFunction) _wrap_KeyEvent_m_controlDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_shiftDown_set", (PyCFunction) _wrap_KeyEvent_m_shiftDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_shiftDown_get", (PyCFunction) _wrap_KeyEvent_m_shiftDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_altDown_set", (PyCFunction) _wrap_KeyEvent_m_altDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_altDown_get", (PyCFunction) _wrap_KeyEvent_m_altDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_metaDown_set", (PyCFunction) _wrap_KeyEvent_m_metaDown_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_metaDown_get", (PyCFunction) _wrap_KeyEvent_m_metaDown_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_scanCode_set", (PyCFunction) _wrap_KeyEvent_m_scanCode_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_scanCode_get", (PyCFunction) _wrap_KeyEvent_m_scanCode_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_rawCode_set", (PyCFunction) _wrap_KeyEvent_m_rawCode_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_rawCode_get", (PyCFunction) _wrap_KeyEvent_m_rawCode_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_rawFlags_set", (PyCFunction) _wrap_KeyEvent_m_rawFlags_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_m_rawFlags_get", (PyCFunction) _wrap_KeyEvent_m_rawFlags_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"KeyEvent_swigregister", KeyEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SizeEvent", (PyCFunction) _wrap_new_SizeEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_GetSize", (PyCFunction) _wrap_SizeEvent_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_GetRect", (PyCFunction) _wrap_SizeEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_SetRect", (PyCFunction) _wrap_SizeEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_SetSize", (PyCFunction) _wrap_SizeEvent_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_m_size_set", (PyCFunction) _wrap_SizeEvent_m_size_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_m_size_get", (PyCFunction) _wrap_SizeEvent_m_size_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_m_rect_set", (PyCFunction) _wrap_SizeEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_m_rect_get", (PyCFunction) _wrap_SizeEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizeEvent_swigregister", SizeEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MoveEvent", (PyCFunction) _wrap_new_MoveEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_GetPosition", (PyCFunction) _wrap_MoveEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_GetRect", (PyCFunction) _wrap_MoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_SetRect", (PyCFunction) _wrap_MoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_SetPosition", (PyCFunction) _wrap_MoveEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_m_pos_set", (PyCFunction) _wrap_MoveEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_m_pos_get", (PyCFunction) _wrap_MoveEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_m_rect_set", (PyCFunction) _wrap_MoveEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_m_rect_get", (PyCFunction) _wrap_MoveEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MoveEvent_swigregister", MoveEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PaintEvent", (PyCFunction) _wrap_new_PaintEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PaintEvent_swigregister", PaintEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_NcPaintEvent", (PyCFunction) _wrap_new_NcPaintEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NcPaintEvent_swigregister", NcPaintEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_EraseEvent", (PyCFunction) _wrap_new_EraseEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EraseEvent_GetDC", (PyCFunction) _wrap_EraseEvent_GetDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EraseEvent_swigregister", EraseEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FocusEvent", (PyCFunction) _wrap_new_FocusEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FocusEvent_GetWindow", (PyCFunction) _wrap_FocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FocusEvent_SetWindow", (PyCFunction) _wrap_FocusEvent_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FocusEvent_swigregister", FocusEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ChildFocusEvent", (PyCFunction) _wrap_new_ChildFocusEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ChildFocusEvent_GetWindow", (PyCFunction) _wrap_ChildFocusEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ChildFocusEvent_swigregister", ChildFocusEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ActivateEvent", (PyCFunction) _wrap_new_ActivateEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ActivateEvent_GetActive", (PyCFunction) _wrap_ActivateEvent_GetActive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ActivateEvent_swigregister", ActivateEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_InitDialogEvent", (PyCFunction) _wrap_new_InitDialogEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"InitDialogEvent_swigregister", InitDialogEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MenuEvent", (PyCFunction) _wrap_new_MenuEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuEvent_GetMenuId", (PyCFunction) _wrap_MenuEvent_GetMenuId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuEvent_IsPopup", (PyCFunction) _wrap_MenuEvent_IsPopup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuEvent_GetMenu", (PyCFunction) _wrap_MenuEvent_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuEvent_swigregister", MenuEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CloseEvent", (PyCFunction) _wrap_new_CloseEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_SetLoggingOff", (PyCFunction) _wrap_CloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_GetLoggingOff", (PyCFunction) _wrap_CloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_Veto", (PyCFunction) _wrap_CloseEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_SetCanVeto", (PyCFunction) _wrap_CloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_CanVeto", (PyCFunction) _wrap_CloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CloseEvent_swigregister", CloseEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShowEvent_GetShow", (PyCFunction) _wrap_ShowEvent_GetShow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ShowEvent_swigregister", ShowEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_IconizeEvent", (PyCFunction) _wrap_new_IconizeEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconizeEvent_Iconized", (PyCFunction) _wrap_IconizeEvent_Iconized, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconizeEvent_swigregister", IconizeEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MaximizeEvent", (PyCFunction) _wrap_new_MaximizeEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MaximizeEvent_swigregister", MaximizeEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"DropFilesEvent_GetPosition", (PyCFunction) _wrap_DropFilesEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropFilesEvent_GetNumberOfFiles", (PyCFunction) _wrap_DropFilesEvent_GetNumberOfFiles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropFilesEvent_GetFiles", (PyCFunction) _wrap_DropFilesEvent_GetFiles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropFilesEvent_swigregister", DropFilesEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_UpdateUIEvent", (PyCFunction) _wrap_new_UpdateUIEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetChecked", (PyCFunction) _wrap_UpdateUIEvent_GetChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetEnabled", (PyCFunction) _wrap_UpdateUIEvent_GetEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetText", (PyCFunction) _wrap_UpdateUIEvent_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetSetText", (PyCFunction) _wrap_UpdateUIEvent_GetSetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetSetChecked", (PyCFunction) _wrap_UpdateUIEvent_GetSetChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetSetEnabled", (PyCFunction) _wrap_UpdateUIEvent_GetSetEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_Check", (PyCFunction) _wrap_UpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_Enable", (PyCFunction) _wrap_UpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_SetText", (PyCFunction) _wrap_UpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_SetUpdateInterval", (PyCFunction) _wrap_UpdateUIEvent_SetUpdateInterval, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetUpdateInterval", (PyCFunction) _wrap_UpdateUIEvent_GetUpdateInterval, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_CanUpdate", (PyCFunction) _wrap_UpdateUIEvent_CanUpdate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_ResetUpdateTime", (PyCFunction) _wrap_UpdateUIEvent_ResetUpdateTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_SetMode", (PyCFunction) _wrap_UpdateUIEvent_SetMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_GetMode", (PyCFunction) _wrap_UpdateUIEvent_GetMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"UpdateUIEvent_swigregister", UpdateUIEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SysColourChangedEvent", (PyCFunction) _wrap_new_SysColourChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SysColourChangedEvent_swigregister", SysColourChangedEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MouseCaptureChangedEvent", (PyCFunction) _wrap_new_MouseCaptureChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseCaptureChangedEvent_GetCapturedWindow", (PyCFunction) _wrap_MouseCaptureChangedEvent_GetCapturedWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MouseCaptureChangedEvent_swigregister", MouseCaptureChangedEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DisplayChangedEvent", (PyCFunction) _wrap_new_DisplayChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DisplayChangedEvent_swigregister", DisplayChangedEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PaletteChangedEvent", (PyCFunction) _wrap_new_PaletteChangedEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PaletteChangedEvent_SetChangedWindow", (PyCFunction) _wrap_PaletteChangedEvent_SetChangedWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PaletteChangedEvent_GetChangedWindow", (PyCFunction) _wrap_PaletteChangedEvent_GetChangedWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PaletteChangedEvent_swigregister", PaletteChangedEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_QueryNewPaletteEvent", (PyCFunction) _wrap_new_QueryNewPaletteEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryNewPaletteEvent_SetPaletteRealized", (PyCFunction) _wrap_QueryNewPaletteEvent_SetPaletteRealized, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryNewPaletteEvent_GetPaletteRealized", (PyCFunction) _wrap_QueryNewPaletteEvent_GetPaletteRealized, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryNewPaletteEvent_swigregister", QueryNewPaletteEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_NavigationKeyEvent", (PyCFunction) _wrap_new_NavigationKeyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_GetDirection", (PyCFunction) _wrap_NavigationKeyEvent_GetDirection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_SetDirection", (PyCFunction) _wrap_NavigationKeyEvent_SetDirection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_IsWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_IsWindowChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_SetWindowChange", (PyCFunction) _wrap_NavigationKeyEvent_SetWindowChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_SetFlags", (PyCFunction) _wrap_NavigationKeyEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_GetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_GetCurrentFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_SetCurrentFocus", (PyCFunction) _wrap_NavigationKeyEvent_SetCurrentFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NavigationKeyEvent_swigregister", NavigationKeyEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_WindowCreateEvent", (PyCFunction) _wrap_new_WindowCreateEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WindowCreateEvent_GetWindow", (PyCFunction) _wrap_WindowCreateEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WindowCreateEvent_swigregister", WindowCreateEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_WindowDestroyEvent", (PyCFunction) _wrap_new_WindowDestroyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WindowDestroyEvent_GetWindow", (PyCFunction) _wrap_WindowDestroyEvent_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WindowDestroyEvent_swigregister", WindowDestroyEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ContextMenuEvent", (PyCFunction) _wrap_new_ContextMenuEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextMenuEvent_GetPosition", (PyCFunction) _wrap_ContextMenuEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextMenuEvent_SetPosition", (PyCFunction) _wrap_ContextMenuEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ContextMenuEvent_swigregister", ContextMenuEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_IdleEvent", (PyCFunction) _wrap_new_IdleEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IdleEvent_RequestMore", (PyCFunction) _wrap_IdleEvent_RequestMore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IdleEvent_MoreRequested", (PyCFunction) _wrap_IdleEvent_MoreRequested, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IdleEvent_SetMode", (PyCFunction) _wrap_IdleEvent_SetMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IdleEvent_GetMode", (PyCFunction) _wrap_IdleEvent_GetMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IdleEvent_CanSend", (PyCFunction) _wrap_IdleEvent_CanSend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IdleEvent_swigregister", IdleEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyEvent", (PyCFunction) _wrap_new_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_PyEvent", (PyCFunction) _wrap_delete_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEvent_SetSelf", (PyCFunction) _wrap_PyEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEvent_GetSelf", (PyCFunction) _wrap_PyEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyEvent_swigregister", PyEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyCommandEvent", (PyCFunction) _wrap_new_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_PyCommandEvent", (PyCFunction) _wrap_delete_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCommandEvent_SetSelf", (PyCFunction) _wrap_PyCommandEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCommandEvent_GetSelf", (PyCFunction) _wrap_PyCommandEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyCommandEvent_swigregister", PyCommandEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyApp", (PyCFunction) _wrap_new_PyApp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_PyApp", (PyCFunction) _wrap_delete_PyApp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp__setCallbackInfo", (PyCFunction) _wrap_PyApp__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetAppName", (PyCFunction) _wrap_PyApp_GetAppName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetAppName", (PyCFunction) _wrap_PyApp_SetAppName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetClassName", (PyCFunction) _wrap_PyApp_GetClassName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetClassName", (PyCFunction) _wrap_PyApp_SetClassName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetVendorName", (PyCFunction) _wrap_PyApp_GetVendorName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetVendorName", (PyCFunction) _wrap_PyApp_SetVendorName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetTraits", (PyCFunction) _wrap_PyApp_GetTraits, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_ProcessPendingEvents", (PyCFunction) _wrap_PyApp_ProcessPendingEvents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_Yield", (PyCFunction) _wrap_PyApp_Yield, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_WakeUpIdle", (PyCFunction) _wrap_PyApp_WakeUpIdle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_MainLoop", (PyCFunction) _wrap_PyApp_MainLoop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_Exit", (PyCFunction) _wrap_PyApp_Exit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_ExitMainLoop", (PyCFunction) _wrap_PyApp_ExitMainLoop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_Pending", (PyCFunction) _wrap_PyApp_Pending, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_Dispatch", (PyCFunction) _wrap_PyApp_Dispatch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_ProcessIdle", (PyCFunction) _wrap_PyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SendIdleEvents", (PyCFunction) _wrap_PyApp_SendIdleEvents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_IsActive", (PyCFunction) _wrap_PyApp_IsActive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetTopWindow", (PyCFunction) _wrap_PyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetTopWindow", (PyCFunction) _wrap_PyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_PyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetExitOnFrameDelete", (PyCFunction) _wrap_PyApp_GetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetUseBestVisual", (PyCFunction) _wrap_PyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetUseBestVisual", (PyCFunction) _wrap_PyApp_GetUseBestVisual, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetPrintMode", (PyCFunction) _wrap_PyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetPrintMode", (PyCFunction) _wrap_PyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetAssertMode", (PyCFunction) _wrap_PyApp_SetAssertMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetAssertMode", (PyCFunction) _wrap_PyApp_GetAssertMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_GetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_GetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_GetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetMacExitMenuItemId", (PyCFunction) _wrap_PyApp_GetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_GetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetMacSupportPCMenuShortcuts", (PyCFunction) _wrap_PyApp_SetMacSupportPCMenuShortcuts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetMacAboutMenuItemId", (PyCFunction) _wrap_PyApp_SetMacAboutMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetMacPreferencesMenuItemId", (PyCFunction) _wrap_PyApp_SetMacPreferencesMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetMacExitMenuItemId", (PyCFunction) _wrap_PyApp_SetMacExitMenuItemId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_SetMacHelpMenuTitleName", (PyCFunction) _wrap_PyApp_SetMacHelpMenuTitleName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp__BootstrapApp", (PyCFunction) _wrap_PyApp__BootstrapApp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_GetComCtl32Version", (PyCFunction) _wrap_PyApp_GetComCtl32Version, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyApp_swigregister", PyApp_swigregister, METH_VARARGS, NULL },
+        { (char *)"Exit", (PyCFunction) _wrap_Exit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Yield", (PyCFunction) _wrap_Yield, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"YieldIfNeeded", (PyCFunction) _wrap_YieldIfNeeded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SafeYield", (PyCFunction) _wrap_SafeYield, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WakeUpIdle", (PyCFunction) _wrap_WakeUpIdle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PostEvent", (PyCFunction) _wrap_PostEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"App_CleanUp", (PyCFunction) _wrap_App_CleanUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetApp", (PyCFunction) _wrap_GetApp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_AcceleratorEntry", (PyCFunction) _wrap_delete_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorEntry_GetFlags", (PyCFunction) _wrap_AcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_AcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorEntry_GetCommand", (PyCFunction) _wrap_AcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_AcceleratorTable", (PyCFunction) _wrap_delete_AcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorTable_Ok", (PyCFunction) _wrap_AcceleratorTable_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"AcceleratorTable_swigregister", AcceleratorTable_swigregister, METH_VARARGS, NULL },
+        { (char *)"GetAccelFromString", (PyCFunction) _wrap_GetAccelFromString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_VisualAttributes", (PyCFunction) _wrap_new_VisualAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_VisualAttributes", (PyCFunction) _wrap_delete_VisualAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_font_set", (PyCFunction) _wrap_VisualAttributes_font_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_font_get", (PyCFunction) _wrap_VisualAttributes_font_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_colFg_set", (PyCFunction) _wrap_VisualAttributes_colFg_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_colFg_get", (PyCFunction) _wrap_VisualAttributes_colFg_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_colBg_set", (PyCFunction) _wrap_VisualAttributes_colBg_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_colBg_get", (PyCFunction) _wrap_VisualAttributes_colBg_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VisualAttributes_swigregister", VisualAttributes_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Window", (PyCFunction) _wrap_new_Window, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreWindow", (PyCFunction) _wrap_new_PreWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Create", (PyCFunction) _wrap_Window_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Close", (PyCFunction) _wrap_Window_Close, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Destroy", (PyCFunction) _wrap_Window_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_DestroyChildren", (PyCFunction) _wrap_Window_DestroyChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsBeingDeleted", (PyCFunction) _wrap_Window_IsBeingDeleted, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetTitle", (PyCFunction) _wrap_Window_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetTitle", (PyCFunction) _wrap_Window_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetLabel", (PyCFunction) _wrap_Window_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetLabel", (PyCFunction) _wrap_Window_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetName", (PyCFunction) _wrap_Window_SetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetName", (PyCFunction) _wrap_Window_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetWindowVariant", (PyCFunction) _wrap_Window_SetWindowVariant, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetWindowVariant", (PyCFunction) _wrap_Window_GetWindowVariant, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetId", (PyCFunction) _wrap_Window_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetId", (PyCFunction) _wrap_Window_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_NewControlId", (PyCFunction) _wrap_Window_NewControlId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_NextControlId", (PyCFunction) _wrap_Window_NextControlId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PrevControlId", (PyCFunction) _wrap_Window_PrevControlId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetSize", (PyCFunction) _wrap_Window_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetDimensions", (PyCFunction) _wrap_Window_SetDimensions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetRect", (PyCFunction) _wrap_Window_SetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetSizeWH", (PyCFunction) _wrap_Window_SetSizeWH, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Move", (PyCFunction) _wrap_Window_Move, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_MoveXY", (PyCFunction) _wrap_Window_MoveXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetBestFittingSize", (PyCFunction) _wrap_Window_SetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Raise", (PyCFunction) _wrap_Window_Raise, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Lower", (PyCFunction) _wrap_Window_Lower, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetClientSize", (PyCFunction) _wrap_Window_SetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetClientSizeWH", (PyCFunction) _wrap_Window_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetClientRect", (PyCFunction) _wrap_Window_SetClientRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetPosition", (PyCFunction) _wrap_Window_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetPositionTuple", (PyCFunction) _wrap_Window_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetSize", (PyCFunction) _wrap_Window_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetSizeTuple", (PyCFunction) _wrap_Window_GetSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetRect", (PyCFunction) _wrap_Window_GetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetClientSize", (PyCFunction) _wrap_Window_GetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetClientSizeTuple", (PyCFunction) _wrap_Window_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetClientAreaOrigin", (PyCFunction) _wrap_Window_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetClientRect", (PyCFunction) _wrap_Window_GetClientRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBestSize", (PyCFunction) _wrap_Window_GetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBestSizeTuple", (PyCFunction) _wrap_Window_GetBestSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_InvalidateBestSize", (PyCFunction) _wrap_Window_InvalidateBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBestFittingSize", (PyCFunction) _wrap_Window_GetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetAdjustedBestSize", (PyCFunction) _wrap_Window_GetAdjustedBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_CenterOnScreen", (PyCFunction) _wrap_Window_CenterOnScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_CenterOnParent", (PyCFunction) _wrap_Window_CenterOnParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Fit", (PyCFunction) _wrap_Window_Fit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_FitInside", (PyCFunction) _wrap_Window_FitInside, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetSizeHints", (PyCFunction) _wrap_Window_SetSizeHints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetSizeHintsSz", (PyCFunction) _wrap_Window_SetSizeHintsSz, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetVirtualSizeHints", (PyCFunction) _wrap_Window_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetVirtualSizeHintsSz", (PyCFunction) _wrap_Window_SetVirtualSizeHintsSz, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetMaxSize", (PyCFunction) _wrap_Window_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetMinSize", (PyCFunction) _wrap_Window_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetMinSize", (PyCFunction) _wrap_Window_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetMaxSize", (PyCFunction) _wrap_Window_SetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetMinWidth", (PyCFunction) _wrap_Window_GetMinWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetMinHeight", (PyCFunction) _wrap_Window_GetMinHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetMaxWidth", (PyCFunction) _wrap_Window_GetMaxWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetMaxHeight", (PyCFunction) _wrap_Window_GetMaxHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetVirtualSize", (PyCFunction) _wrap_Window_SetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetVirtualSizeWH", (PyCFunction) _wrap_Window_SetVirtualSizeWH, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetVirtualSize", (PyCFunction) _wrap_Window_GetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetVirtualSizeTuple", (PyCFunction) _wrap_Window_GetVirtualSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBestVirtualSize", (PyCFunction) _wrap_Window_GetBestVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Show", (PyCFunction) _wrap_Window_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Hide", (PyCFunction) _wrap_Window_Hide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Enable", (PyCFunction) _wrap_Window_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Disable", (PyCFunction) _wrap_Window_Disable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsShown", (PyCFunction) _wrap_Window_IsShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsEnabled", (PyCFunction) _wrap_Window_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetWindowStyleFlag", (PyCFunction) _wrap_Window_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetWindowStyleFlag", (PyCFunction) _wrap_Window_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_HasFlag", (PyCFunction) _wrap_Window_HasFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsRetained", (PyCFunction) _wrap_Window_IsRetained, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetExtraStyle", (PyCFunction) _wrap_Window_SetExtraStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetExtraStyle", (PyCFunction) _wrap_Window_GetExtraStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_MakeModal", (PyCFunction) _wrap_Window_MakeModal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetThemeEnabled", (PyCFunction) _wrap_Window_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetThemeEnabled", (PyCFunction) _wrap_Window_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetFocus", (PyCFunction) _wrap_Window_SetFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetFocusFromKbd", (PyCFunction) _wrap_Window_SetFocusFromKbd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_FindFocus", (PyCFunction) _wrap_Window_FindFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_AcceptsFocus", (PyCFunction) _wrap_Window_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_Window_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetDefaultItem", (PyCFunction) _wrap_Window_GetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetDefaultItem", (PyCFunction) _wrap_Window_SetDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetTmpDefaultItem", (PyCFunction) _wrap_Window_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Navigate", (PyCFunction) _wrap_Window_Navigate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_MoveAfterInTabOrder", (PyCFunction) _wrap_Window_MoveAfterInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_MoveBeforeInTabOrder", (PyCFunction) _wrap_Window_MoveBeforeInTabOrder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetChildren", (PyCFunction) _wrap_Window_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetParent", (PyCFunction) _wrap_Window_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetGrandParent", (PyCFunction) _wrap_Window_GetGrandParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsTopLevel", (PyCFunction) _wrap_Window_IsTopLevel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetEventHandler", (PyCFunction) _wrap_Window_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetEventHandler", (PyCFunction) _wrap_Window_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PushEventHandler", (PyCFunction) _wrap_Window_PushEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PopEventHandler", (PyCFunction) _wrap_Window_PopEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_RemoveEventHandler", (PyCFunction) _wrap_Window_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetValidator", (PyCFunction) _wrap_Window_SetValidator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetValidator", (PyCFunction) _wrap_Window_GetValidator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Validate", (PyCFunction) _wrap_Window_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_TransferDataToWindow", (PyCFunction) _wrap_Window_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_TransferDataFromWindow", (PyCFunction) _wrap_Window_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_InitDialog", (PyCFunction) _wrap_Window_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetAcceleratorTable", (PyCFunction) _wrap_Window_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetAcceleratorTable", (PyCFunction) _wrap_Window_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_RegisterHotKey", (PyCFunction) _wrap_Window_RegisterHotKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_UnregisterHotKey", (PyCFunction) _wrap_Window_UnregisterHotKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ConvertDialogPointToPixels", (PyCFunction) _wrap_Window_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ConvertDialogSizeToPixels", (PyCFunction) _wrap_Window_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_DLG_PNT", (PyCFunction) _wrap_Window_DLG_PNT, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_DLG_SZE", (PyCFunction) _wrap_Window_DLG_SZE, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ConvertPixelPointToDialog", (PyCFunction) _wrap_Window_ConvertPixelPointToDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ConvertPixelSizeToDialog", (PyCFunction) _wrap_Window_ConvertPixelSizeToDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_WarpPointer", (PyCFunction) _wrap_Window_WarpPointer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_CaptureMouse", (PyCFunction) _wrap_Window_CaptureMouse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ReleaseMouse", (PyCFunction) _wrap_Window_ReleaseMouse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetCapture", (PyCFunction) _wrap_Window_GetCapture, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_HasCapture", (PyCFunction) _wrap_Window_HasCapture, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Refresh", (PyCFunction) _wrap_Window_Refresh, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_RefreshRect", (PyCFunction) _wrap_Window_RefreshRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Update", (PyCFunction) _wrap_Window_Update, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ClearBackground", (PyCFunction) _wrap_Window_ClearBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Freeze", (PyCFunction) _wrap_Window_Freeze, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Thaw", (PyCFunction) _wrap_Window_Thaw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PrepareDC", (PyCFunction) _wrap_Window_PrepareDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetUpdateRegion", (PyCFunction) _wrap_Window_GetUpdateRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetUpdateClientRect", (PyCFunction) _wrap_Window_GetUpdateClientRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetDefaultAttributes", (PyCFunction) _wrap_Window_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetClassDefaultAttributes", (PyCFunction) _wrap_Window_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetOwnBackgroundColour", (PyCFunction) _wrap_Window_SetOwnBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetOwnForegroundColour", (PyCFunction) _wrap_Window_SetOwnForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetForegroundColour", (PyCFunction) _wrap_Window_GetForegroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetBackgroundStyle", (PyCFunction) _wrap_Window_SetBackgroundStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBackgroundStyle", (PyCFunction) _wrap_Window_GetBackgroundStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetCursor", (PyCFunction) _wrap_Window_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetCursor", (PyCFunction) _wrap_Window_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetFont", (PyCFunction) _wrap_Window_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetOwnFont", (PyCFunction) _wrap_Window_SetOwnFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetFont", (PyCFunction) _wrap_Window_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetCaret", (PyCFunction) _wrap_Window_SetCaret, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetCaret", (PyCFunction) _wrap_Window_GetCaret, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetCharHeight", (PyCFunction) _wrap_Window_GetCharHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetCharWidth", (PyCFunction) _wrap_Window_GetCharWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetTextExtent", (PyCFunction) _wrap_Window_GetTextExtent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetFullTextExtent", (PyCFunction) _wrap_Window_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ClientToScreenXY", (PyCFunction) _wrap_Window_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ScreenToClientXY", (PyCFunction) _wrap_Window_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ClientToScreen", (PyCFunction) _wrap_Window_ClientToScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ScreenToClient", (PyCFunction) _wrap_Window_ScreenToClient, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_HitTestXY", (PyCFunction) _wrap_Window_HitTestXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_HitTest", (PyCFunction) _wrap_Window_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetBorder", _wrap_Window_GetBorder, METH_VARARGS, NULL },
+        { (char *)"Window_UpdateWindowUI", (PyCFunction) _wrap_Window_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PopupMenuXY", (PyCFunction) _wrap_Window_PopupMenuXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PopupMenu", (PyCFunction) _wrap_Window_PopupMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetHandle", (PyCFunction) _wrap_Window_GetHandle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_HasScrollbar", (PyCFunction) _wrap_Window_HasScrollbar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetScrollbar", (PyCFunction) _wrap_Window_SetScrollbar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetScrollPos", (PyCFunction) _wrap_Window_SetScrollPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetScrollPos", (PyCFunction) _wrap_Window_GetScrollPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetScrollThumb", (PyCFunction) _wrap_Window_GetScrollThumb, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetScrollRange", (PyCFunction) _wrap_Window_GetScrollRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ScrollWindow", (PyCFunction) _wrap_Window_ScrollWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ScrollLines", (PyCFunction) _wrap_Window_ScrollLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ScrollPages", (PyCFunction) _wrap_Window_ScrollPages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_LineUp", (PyCFunction) _wrap_Window_LineUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_LineDown", (PyCFunction) _wrap_Window_LineDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PageUp", (PyCFunction) _wrap_Window_PageUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_PageDown", (PyCFunction) _wrap_Window_PageDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetHelpText", (PyCFunction) _wrap_Window_SetHelpText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetHelpTextForId", (PyCFunction) _wrap_Window_SetHelpTextForId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetHelpText", (PyCFunction) _wrap_Window_GetHelpText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetToolTipString", (PyCFunction) _wrap_Window_SetToolTipString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetToolTip", (PyCFunction) _wrap_Window_SetToolTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetToolTip", (PyCFunction) _wrap_Window_GetToolTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetDropTarget", (PyCFunction) _wrap_Window_SetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetDropTarget", (PyCFunction) _wrap_Window_GetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetConstraints", (PyCFunction) _wrap_Window_SetConstraints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetConstraints", (PyCFunction) _wrap_Window_GetConstraints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetAutoLayout", (PyCFunction) _wrap_Window_SetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetAutoLayout", (PyCFunction) _wrap_Window_GetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_Layout", (PyCFunction) _wrap_Window_Layout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetSizer", (PyCFunction) _wrap_Window_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetSizerAndFit", (PyCFunction) _wrap_Window_SetSizerAndFit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetSizer", (PyCFunction) _wrap_Window_GetSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_SetContainingSizer", (PyCFunction) _wrap_Window_SetContainingSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_GetContainingSizer", (PyCFunction) _wrap_Window_GetContainingSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_InheritAttributes", (PyCFunction) _wrap_Window_InheritAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_ShouldInheritColours", (PyCFunction) _wrap_Window_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_swigregister", Window_swigregister, METH_VARARGS, NULL },
+        { (char *)"FindWindowById", (PyCFunction) _wrap_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindWindowByName", (PyCFunction) _wrap_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindWindowByLabel", (PyCFunction) _wrap_FindWindowByLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Window_FromHWND", (PyCFunction) _wrap_Window_FromHWND, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Validator", (PyCFunction) _wrap_new_Validator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_Clone", (PyCFunction) _wrap_Validator_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_Validate", (PyCFunction) _wrap_Validator_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_TransferToWindow", (PyCFunction) _wrap_Validator_TransferToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_TransferFromWindow", (PyCFunction) _wrap_Validator_TransferFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_GetWindow", (PyCFunction) _wrap_Validator_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_SetWindow", (PyCFunction) _wrap_Validator_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_IsSilent", (PyCFunction) _wrap_Validator_IsSilent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_SetBellOnError", (PyCFunction) _wrap_Validator_SetBellOnError, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Validator_swigregister", Validator_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyValidator", (PyCFunction) _wrap_new_PyValidator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyValidator__setCallbackInfo", (PyCFunction) _wrap_PyValidator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyValidator_swigregister", PyValidator_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Menu", (PyCFunction) _wrap_new_Menu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Append", (PyCFunction) _wrap_Menu_Append, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_AppendSeparator", (PyCFunction) _wrap_Menu_AppendSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_AppendCheckItem", (PyCFunction) _wrap_Menu_AppendCheckItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_AppendRadioItem", (PyCFunction) _wrap_Menu_AppendRadioItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_AppendMenu", (PyCFunction) _wrap_Menu_AppendMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_AppendItem", (PyCFunction) _wrap_Menu_AppendItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Break", (PyCFunction) _wrap_Menu_Break, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_InsertItem", (PyCFunction) _wrap_Menu_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Insert", (PyCFunction) _wrap_Menu_Insert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_InsertSeparator", (PyCFunction) _wrap_Menu_InsertSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_InsertCheckItem", (PyCFunction) _wrap_Menu_InsertCheckItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_InsertRadioItem", (PyCFunction) _wrap_Menu_InsertRadioItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_InsertMenu", (PyCFunction) _wrap_Menu_InsertMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_PrependItem", (PyCFunction) _wrap_Menu_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Prepend", (PyCFunction) _wrap_Menu_Prepend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_PrependSeparator", (PyCFunction) _wrap_Menu_PrependSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_PrependCheckItem", (PyCFunction) _wrap_Menu_PrependCheckItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_PrependRadioItem", (PyCFunction) _wrap_Menu_PrependRadioItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_PrependMenu", (PyCFunction) _wrap_Menu_PrependMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Remove", (PyCFunction) _wrap_Menu_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_RemoveItem", (PyCFunction) _wrap_Menu_RemoveItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Delete", (PyCFunction) _wrap_Menu_Delete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_DeleteItem", (PyCFunction) _wrap_Menu_DeleteItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Destroy", (PyCFunction) _wrap_Menu_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_DestroyId", (PyCFunction) _wrap_Menu_DestroyId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_DestroyItem", (PyCFunction) _wrap_Menu_DestroyItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetMenuItemCount", (PyCFunction) _wrap_Menu_GetMenuItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetMenuItems", (PyCFunction) _wrap_Menu_GetMenuItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_FindItem", (PyCFunction) _wrap_Menu_FindItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_FindItemById", (PyCFunction) _wrap_Menu_FindItemById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_FindItemByPosition", (PyCFunction) _wrap_Menu_FindItemByPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Enable", (PyCFunction) _wrap_Menu_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_IsEnabled", (PyCFunction) _wrap_Menu_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Check", (PyCFunction) _wrap_Menu_Check, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_IsChecked", (PyCFunction) _wrap_Menu_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_SetLabel", (PyCFunction) _wrap_Menu_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetLabel", (PyCFunction) _wrap_Menu_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_SetHelpString", (PyCFunction) _wrap_Menu_SetHelpString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetHelpString", (PyCFunction) _wrap_Menu_GetHelpString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_SetTitle", (PyCFunction) _wrap_Menu_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetTitle", (PyCFunction) _wrap_Menu_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_SetEventHandler", (PyCFunction) _wrap_Menu_SetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetEventHandler", (PyCFunction) _wrap_Menu_GetEventHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_SetInvokingWindow", (PyCFunction) _wrap_Menu_SetInvokingWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetInvokingWindow", (PyCFunction) _wrap_Menu_GetInvokingWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetStyle", (PyCFunction) _wrap_Menu_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_UpdateUI", (PyCFunction) _wrap_Menu_UpdateUI, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetMenuBar", (PyCFunction) _wrap_Menu_GetMenuBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Attach", (PyCFunction) _wrap_Menu_Attach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_Detach", (PyCFunction) _wrap_Menu_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_IsAttached", (PyCFunction) _wrap_Menu_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_SetParent", (PyCFunction) _wrap_Menu_SetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_GetParent", (PyCFunction) _wrap_Menu_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Menu_swigregister", Menu_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MenuBar", (PyCFunction) _wrap_new_MenuBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Append", (PyCFunction) _wrap_MenuBar_Append, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Insert", (PyCFunction) _wrap_MenuBar_Insert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_GetMenuCount", (PyCFunction) _wrap_MenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_GetMenu", (PyCFunction) _wrap_MenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Replace", (PyCFunction) _wrap_MenuBar_Replace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Remove", (PyCFunction) _wrap_MenuBar_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_EnableTop", (PyCFunction) _wrap_MenuBar_EnableTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_IsEnabledTop", (PyCFunction) _wrap_MenuBar_IsEnabledTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_SetLabelTop", (PyCFunction) _wrap_MenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_GetLabelTop", (PyCFunction) _wrap_MenuBar_GetLabelTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_FindMenuItem", (PyCFunction) _wrap_MenuBar_FindMenuItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_FindItemById", (PyCFunction) _wrap_MenuBar_FindItemById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_FindMenu", (PyCFunction) _wrap_MenuBar_FindMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Enable", (PyCFunction) _wrap_MenuBar_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Check", (PyCFunction) _wrap_MenuBar_Check, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_IsChecked", (PyCFunction) _wrap_MenuBar_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_IsEnabled", (PyCFunction) _wrap_MenuBar_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_SetLabel", (PyCFunction) _wrap_MenuBar_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_GetLabel", (PyCFunction) _wrap_MenuBar_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_SetHelpString", (PyCFunction) _wrap_MenuBar_SetHelpString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_GetHelpString", (PyCFunction) _wrap_MenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_GetFrame", (PyCFunction) _wrap_MenuBar_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_IsAttached", (PyCFunction) _wrap_MenuBar_IsAttached, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Attach", (PyCFunction) _wrap_MenuBar_Attach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_Detach", (PyCFunction) _wrap_MenuBar_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuBar_swigregister", MenuBar_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MenuItem", (PyCFunction) _wrap_new_MenuItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetMenu", (PyCFunction) _wrap_MenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetMenu", (PyCFunction) _wrap_MenuItem_SetMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetId", (PyCFunction) _wrap_MenuItem_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetId", (PyCFunction) _wrap_MenuItem_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_IsSeparator", (PyCFunction) _wrap_MenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetText", (PyCFunction) _wrap_MenuItem_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetLabel", (PyCFunction) _wrap_MenuItem_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetText", (PyCFunction) _wrap_MenuItem_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetLabelFromText", (PyCFunction) _wrap_MenuItem_GetLabelFromText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetKind", (PyCFunction) _wrap_MenuItem_GetKind, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetKind", (PyCFunction) _wrap_MenuItem_SetKind, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetCheckable", (PyCFunction) _wrap_MenuItem_SetCheckable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_IsCheckable", (PyCFunction) _wrap_MenuItem_IsCheckable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_IsSubMenu", (PyCFunction) _wrap_MenuItem_IsSubMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetSubMenu", (PyCFunction) _wrap_MenuItem_SetSubMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetSubMenu", (PyCFunction) _wrap_MenuItem_GetSubMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_Enable", (PyCFunction) _wrap_MenuItem_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_IsEnabled", (PyCFunction) _wrap_MenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_Check", (PyCFunction) _wrap_MenuItem_Check, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_IsChecked", (PyCFunction) _wrap_MenuItem_IsChecked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_Toggle", (PyCFunction) _wrap_MenuItem_Toggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetHelp", (PyCFunction) _wrap_MenuItem_SetHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetHelp", (PyCFunction) _wrap_MenuItem_GetHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetAccel", (PyCFunction) _wrap_MenuItem_GetAccel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetAccel", (PyCFunction) _wrap_MenuItem_SetAccel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetDefaultMarginWidth", (PyCFunction) _wrap_MenuItem_GetDefaultMarginWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_SetBitmap", (PyCFunction) _wrap_MenuItem_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_GetBitmap", (PyCFunction) _wrap_MenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MenuItem_swigregister", MenuItem_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Control", (PyCFunction) _wrap_new_Control, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreControl", (PyCFunction) _wrap_new_PreControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Control_Create", (PyCFunction) _wrap_Control_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Control_Command", (PyCFunction) _wrap_Control_Command, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Control_GetLabel", (PyCFunction) _wrap_Control_GetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Control_SetLabel", (PyCFunction) _wrap_Control_SetLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Control_GetClassDefaultAttributes", (PyCFunction) _wrap_Control_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Control_swigregister", Control_swigregister, METH_VARARGS, NULL },
+        { (char *)"ItemContainer_Append", (PyCFunction) _wrap_ItemContainer_Append, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_AppendItems", (PyCFunction) _wrap_ItemContainer_AppendItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_Insert", (PyCFunction) _wrap_ItemContainer_Insert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_Clear", (PyCFunction) _wrap_ItemContainer_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_Delete", (PyCFunction) _wrap_ItemContainer_Delete, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_GetCount", (PyCFunction) _wrap_ItemContainer_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_IsEmpty", (PyCFunction) _wrap_ItemContainer_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_GetString", (PyCFunction) _wrap_ItemContainer_GetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_GetStrings", (PyCFunction) _wrap_ItemContainer_GetStrings, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_SetString", (PyCFunction) _wrap_ItemContainer_SetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_FindString", (PyCFunction) _wrap_ItemContainer_FindString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_Select", (PyCFunction) _wrap_ItemContainer_Select, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_GetSelection", (PyCFunction) _wrap_ItemContainer_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_GetStringSelection", (PyCFunction) _wrap_ItemContainer_GetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_GetClientData", (PyCFunction) _wrap_ItemContainer_GetClientData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_SetClientData", (PyCFunction) _wrap_ItemContainer_SetClientData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ItemContainer_swigregister", ItemContainer_swigregister, METH_VARARGS, NULL },
+        { (char *)"ControlWithItems_swigregister", ControlWithItems_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SizerItem", (PyCFunction) _wrap_new_SizerItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_SizerItemWindow", (PyCFunction) _wrap_new_SizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_SizerItemSpacer", (PyCFunction) _wrap_new_SizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_SizerItemSizer", (PyCFunction) _wrap_new_SizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_DeleteWindows", (PyCFunction) _wrap_SizerItem_DeleteWindows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_DetachSizer", (PyCFunction) _wrap_SizerItem_DetachSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetSize", (PyCFunction) _wrap_SizerItem_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_CalcMin", (PyCFunction) _wrap_SizerItem_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetDimension", (PyCFunction) _wrap_SizerItem_SetDimension, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetMinSize", (PyCFunction) _wrap_SizerItem_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetMinSizeWithBorder", (PyCFunction) _wrap_SizerItem_GetMinSizeWithBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetInitSize", (PyCFunction) _wrap_SizerItem_SetInitSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetRatioWH", (PyCFunction) _wrap_SizerItem_SetRatioWH, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetRatioSize", (PyCFunction) _wrap_SizerItem_SetRatioSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetRatio", (PyCFunction) _wrap_SizerItem_SetRatio, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetRatio", (PyCFunction) _wrap_SizerItem_GetRatio, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_IsWindow", (PyCFunction) _wrap_SizerItem_IsWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_IsSizer", (PyCFunction) _wrap_SizerItem_IsSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_IsSpacer", (PyCFunction) _wrap_SizerItem_IsSpacer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetProportion", (PyCFunction) _wrap_SizerItem_SetProportion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetProportion", (PyCFunction) _wrap_SizerItem_GetProportion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetFlag", (PyCFunction) _wrap_SizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetFlag", (PyCFunction) _wrap_SizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetBorder", (PyCFunction) _wrap_SizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetBorder", (PyCFunction) _wrap_SizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetWindow", (PyCFunction) _wrap_SizerItem_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetWindow", (PyCFunction) _wrap_SizerItem_SetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetSizer", (PyCFunction) _wrap_SizerItem_GetSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetSizer", (PyCFunction) _wrap_SizerItem_SetSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetSpacer", (PyCFunction) _wrap_SizerItem_GetSpacer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_SetSpacer", (PyCFunction) _wrap_SizerItem_SetSpacer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_Show", (PyCFunction) _wrap_SizerItem_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_IsShown", (PyCFunction) _wrap_SizerItem_IsShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetPosition", (PyCFunction) _wrap_SizerItem_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_GetUserData", (PyCFunction) _wrap_SizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SizerItem_swigregister", SizerItem_swigregister, METH_VARARGS, NULL },
+        { (char *)"Sizer__setOORInfo", (PyCFunction) _wrap_Sizer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Add", (PyCFunction) _wrap_Sizer_Add, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer__SetItemMinSize", (PyCFunction) _wrap_Sizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_AddItem", (PyCFunction) _wrap_Sizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_InsertItem", (PyCFunction) _wrap_Sizer_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_PrependItem", (PyCFunction) _wrap_Sizer_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_SetDimension", (PyCFunction) _wrap_Sizer_SetDimension, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_SetMinSize", (PyCFunction) _wrap_Sizer_SetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_GetSize", (PyCFunction) _wrap_Sizer_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_GetPosition", (PyCFunction) _wrap_Sizer_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_GetMinSize", (PyCFunction) _wrap_Sizer_GetMinSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_RecalcSizes", (PyCFunction) _wrap_Sizer_RecalcSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_CalcMin", (PyCFunction) _wrap_Sizer_CalcMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Layout", (PyCFunction) _wrap_Sizer_Layout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Fit", (PyCFunction) _wrap_Sizer_Fit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_FitInside", (PyCFunction) _wrap_Sizer_FitInside, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_SetSizeHints", (PyCFunction) _wrap_Sizer_SetSizeHints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_SetVirtualSizeHints", (PyCFunction) _wrap_Sizer_SetVirtualSizeHints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Clear", (PyCFunction) _wrap_Sizer_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_DeleteWindows", (PyCFunction) _wrap_Sizer_DeleteWindows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_GetChildren", (PyCFunction) _wrap_Sizer_GetChildren, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_Show", (PyCFunction) _wrap_Sizer_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_IsShown", (PyCFunction) _wrap_Sizer_IsShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_ShowItems", (PyCFunction) _wrap_Sizer_ShowItems, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sizer_swigregister", Sizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PySizer", (PyCFunction) _wrap_new_PySizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PySizer__setCallbackInfo", (PyCFunction) _wrap_PySizer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PySizer_swigregister", PySizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BoxSizer", (PyCFunction) _wrap_new_BoxSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BoxSizer_GetOrientation", (PyCFunction) _wrap_BoxSizer_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BoxSizer_SetOrientation", (PyCFunction) _wrap_BoxSizer_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BoxSizer_swigregister", BoxSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StaticBoxSizer", (PyCFunction) _wrap_new_StaticBoxSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBoxSizer_GetStaticBox", (PyCFunction) _wrap_StaticBoxSizer_GetStaticBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StaticBoxSizer_swigregister", StaticBoxSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridSizer", (PyCFunction) _wrap_new_GridSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_SetCols", (PyCFunction) _wrap_GridSizer_SetCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_SetRows", (PyCFunction) _wrap_GridSizer_SetRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_SetVGap", (PyCFunction) _wrap_GridSizer_SetVGap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_SetHGap", (PyCFunction) _wrap_GridSizer_SetHGap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_GetCols", (PyCFunction) _wrap_GridSizer_GetCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_GetRows", (PyCFunction) _wrap_GridSizer_GetRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_GetVGap", (PyCFunction) _wrap_GridSizer_GetVGap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_GetHGap", (PyCFunction) _wrap_GridSizer_GetHGap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizer_swigregister", GridSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FlexGridSizer", (PyCFunction) _wrap_new_FlexGridSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_AddGrowableRow", (PyCFunction) _wrap_FlexGridSizer_AddGrowableRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_RemoveGrowableRow", (PyCFunction) _wrap_FlexGridSizer_RemoveGrowableRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_AddGrowableCol", (PyCFunction) _wrap_FlexGridSizer_AddGrowableCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_RemoveGrowableCol", (PyCFunction) _wrap_FlexGridSizer_RemoveGrowableCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_SetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_SetFlexibleDirection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_GetFlexibleDirection", (PyCFunction) _wrap_FlexGridSizer_GetFlexibleDirection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_SetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_SetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_GetNonFlexibleGrowMode", (PyCFunction) _wrap_FlexGridSizer_GetNonFlexibleGrowMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_GetRowHeights", (PyCFunction) _wrap_FlexGridSizer_GetRowHeights, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_GetColWidths", (PyCFunction) _wrap_FlexGridSizer_GetColWidths, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FlexGridSizer_swigregister", FlexGridSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GBPosition", (PyCFunction) _wrap_new_GBPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_GetRow", (PyCFunction) _wrap_GBPosition_GetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_GetCol", (PyCFunction) _wrap_GBPosition_GetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_SetRow", (PyCFunction) _wrap_GBPosition_SetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_SetCol", (PyCFunction) _wrap_GBPosition_SetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition___eq__", (PyCFunction) _wrap_GBPosition___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition___ne__", (PyCFunction) _wrap_GBPosition___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_Set", (PyCFunction) _wrap_GBPosition_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_Get", (PyCFunction) _wrap_GBPosition_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBPosition_swigregister", GBPosition_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GBSpan", (PyCFunction) _wrap_new_GBSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_GetRowspan", (PyCFunction) _wrap_GBSpan_GetRowspan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_GetColspan", (PyCFunction) _wrap_GBSpan_GetColspan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_SetRowspan", (PyCFunction) _wrap_GBSpan_SetRowspan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_SetColspan", (PyCFunction) _wrap_GBSpan_SetColspan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan___eq__", (PyCFunction) _wrap_GBSpan___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan___ne__", (PyCFunction) _wrap_GBSpan___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_Set", (PyCFunction) _wrap_GBSpan_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_Get", (PyCFunction) _wrap_GBSpan_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSpan_swigregister", GBSpan_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GBSizerItem", (PyCFunction) _wrap_new_GBSizerItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_GBSizerItemWindow", (PyCFunction) _wrap_new_GBSizerItemWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_GBSizerItemSizer", (PyCFunction) _wrap_new_GBSizerItemSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_GBSizerItemSpacer", (PyCFunction) _wrap_new_GBSizerItemSpacer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_GetPos", (PyCFunction) _wrap_GBSizerItem_GetPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_GetSpan", (PyCFunction) _wrap_GBSizerItem_GetSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_SetPos", (PyCFunction) _wrap_GBSizerItem_SetPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_SetSpan", (PyCFunction) _wrap_GBSizerItem_SetSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_Intersects", (PyCFunction) _wrap_GBSizerItem_Intersects, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_IntersectsPos", (PyCFunction) _wrap_GBSizerItem_IntersectsPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_GetEndPos", (PyCFunction) _wrap_GBSizerItem_GetEndPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_GetGBSizer", (PyCFunction) _wrap_GBSizerItem_GetGBSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_SetGBSizer", (PyCFunction) _wrap_GBSizerItem_SetGBSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GBSizerItem_swigregister", GBSizerItem_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridBagSizer", (PyCFunction) _wrap_new_GridBagSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_Add", (PyCFunction) _wrap_GridBagSizer_Add, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_AddItem", (PyCFunction) _wrap_GridBagSizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_GetEmptyCellSize", (PyCFunction) _wrap_GridBagSizer_GetEmptyCellSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_SetEmptyCellSize", (PyCFunction) _wrap_GridBagSizer_SetEmptyCellSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_GetItemPosition", _wrap_GridBagSizer_GetItemPosition, METH_VARARGS, NULL },
+        { (char *)"GridBagSizer_SetItemPosition", _wrap_GridBagSizer_SetItemPosition, METH_VARARGS, NULL },
+        { (char *)"GridBagSizer_GetItemSpan", _wrap_GridBagSizer_GetItemSpan, METH_VARARGS, NULL },
+        { (char *)"GridBagSizer_SetItemSpan", _wrap_GridBagSizer_SetItemSpan, METH_VARARGS, NULL },
+        { (char *)"GridBagSizer_FindItem", _wrap_GridBagSizer_FindItem, METH_VARARGS, NULL },
+        { (char *)"GridBagSizer_FindItemAtPosition", (PyCFunction) _wrap_GridBagSizer_FindItemAtPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_FindItemAtPoint", (PyCFunction) _wrap_GridBagSizer_FindItemAtPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_CheckForIntersection", (PyCFunction) _wrap_GridBagSizer_CheckForIntersection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_CheckForIntersectionPos", (PyCFunction) _wrap_GridBagSizer_CheckForIntersectionPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridBagSizer_swigregister", GridBagSizer_swigregister, METH_VARARGS, NULL },
+        { (char *)"IndividualLayoutConstraint_Set", (PyCFunction) _wrap_IndividualLayoutConstraint_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_LeftOf", (PyCFunction) _wrap_IndividualLayoutConstraint_LeftOf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_RightOf", (PyCFunction) _wrap_IndividualLayoutConstraint_RightOf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_Above", (PyCFunction) _wrap_IndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_Below", (PyCFunction) _wrap_IndividualLayoutConstraint_Below, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SameAs", (PyCFunction) _wrap_IndividualLayoutConstraint_SameAs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_PercentOf", (PyCFunction) _wrap_IndividualLayoutConstraint_PercentOf, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_Absolute", (PyCFunction) _wrap_IndividualLayoutConstraint_Absolute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_Unconstrained", (PyCFunction) _wrap_IndividualLayoutConstraint_Unconstrained, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_AsIs", (PyCFunction) _wrap_IndividualLayoutConstraint_AsIs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetOtherWindow", (PyCFunction) _wrap_IndividualLayoutConstraint_GetOtherWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetMyEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetMyEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SetEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_SetEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SetValue", (PyCFunction) _wrap_IndividualLayoutConstraint_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetMargin", (PyCFunction) _wrap_IndividualLayoutConstraint_GetMargin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SetMargin", (PyCFunction) _wrap_IndividualLayoutConstraint_SetMargin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetValue", (PyCFunction) _wrap_IndividualLayoutConstraint_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetPercent", (PyCFunction) _wrap_IndividualLayoutConstraint_GetPercent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetOtherEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetOtherEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetDone", (PyCFunction) _wrap_IndividualLayoutConstraint_GetDone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SetDone", (PyCFunction) _wrap_IndividualLayoutConstraint_SetDone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetRelationship", (PyCFunction) _wrap_IndividualLayoutConstraint_GetRelationship, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SetRelationship", (PyCFunction) _wrap_IndividualLayoutConstraint_SetRelationship, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_ResetIfWin", (PyCFunction) _wrap_IndividualLayoutConstraint_ResetIfWin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_SatisfyConstraint", (PyCFunction) _wrap_IndividualLayoutConstraint_SatisfyConstraint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_GetEdge", (PyCFunction) _wrap_IndividualLayoutConstraint_GetEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IndividualLayoutConstraint_swigregister", IndividualLayoutConstraint_swigregister, METH_VARARGS, NULL },
+        { (char *)"LayoutConstraints_left_get", (PyCFunction) _wrap_LayoutConstraints_left_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_top_get", (PyCFunction) _wrap_LayoutConstraints_top_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_right_get", (PyCFunction) _wrap_LayoutConstraints_right_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_bottom_get", (PyCFunction) _wrap_LayoutConstraints_bottom_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_width_get", (PyCFunction) _wrap_LayoutConstraints_width_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_height_get", (PyCFunction) _wrap_LayoutConstraints_height_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_centreX_get", (PyCFunction) _wrap_LayoutConstraints_centreX_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_centreY_get", (PyCFunction) _wrap_LayoutConstraints_centreY_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_LayoutConstraints", (PyCFunction) _wrap_new_LayoutConstraints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_SatisfyConstraints", (PyCFunction) _wrap_LayoutConstraints_SatisfyConstraints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_AreSatisfied", (PyCFunction) _wrap_LayoutConstraints_AreSatisfied, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutConstraints_swigregister", LayoutConstraints_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -42062,7 +42233,7 @@ _swigt__p_wxPyValidator,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -42097,605 +42268,605 @@ SWIGEXPORT(void) SWIG_init(void) {
     Py_XDECREF(cobj);
 #endif
     
-    PyDict_SetItemString(d,"NOT_FOUND", SWIG_FromInt((int)wxNOT_FOUND));
-    PyDict_SetItemString(d,"VSCROLL", SWIG_FromInt((int)wxVSCROLL));
-    PyDict_SetItemString(d,"HSCROLL", SWIG_FromInt((int)wxHSCROLL));
-    PyDict_SetItemString(d,"CAPTION", SWIG_FromInt((int)wxCAPTION));
-    PyDict_SetItemString(d,"DOUBLE_BORDER", SWIG_FromInt((int)wxDOUBLE_BORDER));
-    PyDict_SetItemString(d,"SUNKEN_BORDER", SWIG_FromInt((int)wxSUNKEN_BORDER));
-    PyDict_SetItemString(d,"RAISED_BORDER", SWIG_FromInt((int)wxRAISED_BORDER));
-    PyDict_SetItemString(d,"BORDER", SWIG_FromInt((int)wxBORDER));
-    PyDict_SetItemString(d,"SIMPLE_BORDER", SWIG_FromInt((int)wxSIMPLE_BORDER));
-    PyDict_SetItemString(d,"STATIC_BORDER", SWIG_FromInt((int)wxSTATIC_BORDER));
-    PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_FromInt((int)wxTRANSPARENT_WINDOW));
-    PyDict_SetItemString(d,"NO_BORDER", SWIG_FromInt((int)wxNO_BORDER));
-    PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_FromInt((int)wxTAB_TRAVERSAL));
-    PyDict_SetItemString(d,"WANTS_CHARS", SWIG_FromInt((int)wxWANTS_CHARS));
-    PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_FromInt((int)wxPOPUP_WINDOW));
-    PyDict_SetItemString(d,"CENTER_FRAME", SWIG_FromInt((int)wxCENTER_FRAME));
-    PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_FromInt((int)wxCENTRE_ON_SCREEN));
-    PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_FromInt((int)wxCENTER_ON_SCREEN));
-    PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_FromInt((int)wxED_CLIENT_MARGIN));
-    PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_FromInt((int)wxED_BUTTONS_BOTTOM));
-    PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_FromInt((int)wxED_BUTTONS_RIGHT));
-    PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_FromInt((int)wxED_STATIC_LINE));
-    PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_FromInt((int)wxEXT_DIALOG_STYLE));
-    PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_FromInt((int)wxCLIP_CHILDREN));
-    PyDict_SetItemString(d,"CLIP_SIBLINGS", SWIG_FromInt((int)wxCLIP_SIBLINGS));
-    PyDict_SetItemString(d,"ALWAYS_SHOW_SB", SWIG_FromInt((int)wxALWAYS_SHOW_SB));
-    PyDict_SetItemString(d,"RETAINED", SWIG_FromInt((int)wxRETAINED));
-    PyDict_SetItemString(d,"BACKINGSTORE", SWIG_FromInt((int)wxBACKINGSTORE));
-    PyDict_SetItemString(d,"COLOURED", SWIG_FromInt((int)wxCOLOURED));
-    PyDict_SetItemString(d,"FIXED_LENGTH", SWIG_FromInt((int)wxFIXED_LENGTH));
-    PyDict_SetItemString(d,"LB_NEEDED_SB", SWIG_FromInt((int)wxLB_NEEDED_SB));
-    PyDict_SetItemString(d,"LB_ALWAYS_SB", SWIG_FromInt((int)wxLB_ALWAYS_SB));
-    PyDict_SetItemString(d,"LB_SORT", SWIG_FromInt((int)wxLB_SORT));
-    PyDict_SetItemString(d,"LB_SINGLE", SWIG_FromInt((int)wxLB_SINGLE));
-    PyDict_SetItemString(d,"LB_MULTIPLE", SWIG_FromInt((int)wxLB_MULTIPLE));
-    PyDict_SetItemString(d,"LB_EXTENDED", SWIG_FromInt((int)wxLB_EXTENDED));
-    PyDict_SetItemString(d,"LB_OWNERDRAW", SWIG_FromInt((int)wxLB_OWNERDRAW));
-    PyDict_SetItemString(d,"LB_HSCROLL", SWIG_FromInt((int)wxLB_HSCROLL));
-    PyDict_SetItemString(d,"PROCESS_ENTER", SWIG_FromInt((int)wxPROCESS_ENTER));
-    PyDict_SetItemString(d,"PASSWORD", SWIG_FromInt((int)wxPASSWORD));
-    PyDict_SetItemString(d,"CB_SIMPLE", SWIG_FromInt((int)wxCB_SIMPLE));
-    PyDict_SetItemString(d,"CB_DROPDOWN", SWIG_FromInt((int)wxCB_DROPDOWN));
-    PyDict_SetItemString(d,"CB_SORT", SWIG_FromInt((int)wxCB_SORT));
-    PyDict_SetItemString(d,"CB_READONLY", SWIG_FromInt((int)wxCB_READONLY));
-    PyDict_SetItemString(d,"RA_HORIZONTAL", SWIG_FromInt((int)wxRA_HORIZONTAL));
-    PyDict_SetItemString(d,"RA_VERTICAL", SWIG_FromInt((int)wxRA_VERTICAL));
-    PyDict_SetItemString(d,"RA_SPECIFY_ROWS", SWIG_FromInt((int)wxRA_SPECIFY_ROWS));
-    PyDict_SetItemString(d,"RA_SPECIFY_COLS", SWIG_FromInt((int)wxRA_SPECIFY_COLS));
-    PyDict_SetItemString(d,"RB_GROUP", SWIG_FromInt((int)wxRB_GROUP));
-    PyDict_SetItemString(d,"RB_SINGLE", SWIG_FromInt((int)wxRB_SINGLE));
-    PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_FromInt((int)wxSL_HORIZONTAL));
-    PyDict_SetItemString(d,"SL_VERTICAL", SWIG_FromInt((int)wxSL_VERTICAL));
-    PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_FromInt((int)wxSL_AUTOTICKS));
-    PyDict_SetItemString(d,"SL_LABELS", SWIG_FromInt((int)wxSL_LABELS));
-    PyDict_SetItemString(d,"SL_LEFT", SWIG_FromInt((int)wxSL_LEFT));
-    PyDict_SetItemString(d,"SL_TOP", SWIG_FromInt((int)wxSL_TOP));
-    PyDict_SetItemString(d,"SL_RIGHT", SWIG_FromInt((int)wxSL_RIGHT));
-    PyDict_SetItemString(d,"SL_BOTTOM", SWIG_FromInt((int)wxSL_BOTTOM));
-    PyDict_SetItemString(d,"SL_BOTH", SWIG_FromInt((int)wxSL_BOTH));
-    PyDict_SetItemString(d,"SL_SELRANGE", SWIG_FromInt((int)wxSL_SELRANGE));
-    PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_FromInt((int)wxSB_HORIZONTAL));
-    PyDict_SetItemString(d,"SB_VERTICAL", SWIG_FromInt((int)wxSB_VERTICAL));
-    PyDict_SetItemString(d,"ST_SIZEGRIP", SWIG_FromInt((int)wxST_SIZEGRIP));
-    PyDict_SetItemString(d,"ST_NO_AUTORESIZE", SWIG_FromInt((int)wxST_NO_AUTORESIZE));
-    PyDict_SetItemString(d,"FLOOD_SURFACE", SWIG_FromInt((int)wxFLOOD_SURFACE));
-    PyDict_SetItemString(d,"FLOOD_BORDER", SWIG_FromInt((int)wxFLOOD_BORDER));
-    PyDict_SetItemString(d,"ODDEVEN_RULE", SWIG_FromInt((int)wxODDEVEN_RULE));
-    PyDict_SetItemString(d,"WINDING_RULE", SWIG_FromInt((int)wxWINDING_RULE));
-    PyDict_SetItemString(d,"TOOL_TOP", SWIG_FromInt((int)wxTOOL_TOP));
-    PyDict_SetItemString(d,"TOOL_BOTTOM", SWIG_FromInt((int)wxTOOL_BOTTOM));
-    PyDict_SetItemString(d,"TOOL_LEFT", SWIG_FromInt((int)wxTOOL_LEFT));
-    PyDict_SetItemString(d,"TOOL_RIGHT", SWIG_FromInt((int)wxTOOL_RIGHT));
-    PyDict_SetItemString(d,"OK", SWIG_FromInt((int)wxOK));
-    PyDict_SetItemString(d,"YES_NO", SWIG_FromInt((int)wxYES_NO));
-    PyDict_SetItemString(d,"CANCEL", SWIG_FromInt((int)wxCANCEL));
-    PyDict_SetItemString(d,"YES", SWIG_FromInt((int)wxYES));
-    PyDict_SetItemString(d,"NO", SWIG_FromInt((int)wxNO));
-    PyDict_SetItemString(d,"NO_DEFAULT", SWIG_FromInt((int)wxNO_DEFAULT));
-    PyDict_SetItemString(d,"YES_DEFAULT", SWIG_FromInt((int)wxYES_DEFAULT));
-    PyDict_SetItemString(d,"ICON_EXCLAMATION", SWIG_FromInt((int)wxICON_EXCLAMATION));
-    PyDict_SetItemString(d,"ICON_HAND", SWIG_FromInt((int)wxICON_HAND));
-    PyDict_SetItemString(d,"ICON_QUESTION", SWIG_FromInt((int)wxICON_QUESTION));
-    PyDict_SetItemString(d,"ICON_INFORMATION", SWIG_FromInt((int)wxICON_INFORMATION));
-    PyDict_SetItemString(d,"ICON_STOP", SWIG_FromInt((int)wxICON_STOP));
-    PyDict_SetItemString(d,"ICON_ASTERISK", SWIG_FromInt((int)wxICON_ASTERISK));
-    PyDict_SetItemString(d,"ICON_MASK", SWIG_FromInt((int)wxICON_MASK));
-    PyDict_SetItemString(d,"ICON_WARNING", SWIG_FromInt((int)wxICON_WARNING));
-    PyDict_SetItemString(d,"ICON_ERROR", SWIG_FromInt((int)wxICON_ERROR));
-    PyDict_SetItemString(d,"FORWARD", SWIG_FromInt((int)wxFORWARD));
-    PyDict_SetItemString(d,"BACKWARD", SWIG_FromInt((int)wxBACKWARD));
-    PyDict_SetItemString(d,"RESET", SWIG_FromInt((int)wxRESET));
-    PyDict_SetItemString(d,"HELP", SWIG_FromInt((int)wxHELP));
-    PyDict_SetItemString(d,"MORE", SWIG_FromInt((int)wxMORE));
-    PyDict_SetItemString(d,"SETUP", SWIG_FromInt((int)wxSETUP));
-    PyDict_SetItemString(d,"SIZE_AUTO_WIDTH", SWIG_FromInt((int)wxSIZE_AUTO_WIDTH));
-    PyDict_SetItemString(d,"SIZE_AUTO_HEIGHT", SWIG_FromInt((int)wxSIZE_AUTO_HEIGHT));
-    PyDict_SetItemString(d,"SIZE_AUTO", SWIG_FromInt((int)wxSIZE_AUTO));
-    PyDict_SetItemString(d,"SIZE_USE_EXISTING", SWIG_FromInt((int)wxSIZE_USE_EXISTING));
-    PyDict_SetItemString(d,"SIZE_ALLOW_MINUS_ONE", SWIG_FromInt((int)wxSIZE_ALLOW_MINUS_ONE));
-    PyDict_SetItemString(d,"PORTRAIT", SWIG_FromInt((int)wxPORTRAIT));
-    PyDict_SetItemString(d,"LANDSCAPE", SWIG_FromInt((int)wxLANDSCAPE));
-    PyDict_SetItemString(d,"PRINT_QUALITY_HIGH", SWIG_FromInt((int)wxPRINT_QUALITY_HIGH));
-    PyDict_SetItemString(d,"PRINT_QUALITY_MEDIUM", SWIG_FromInt((int)wxPRINT_QUALITY_MEDIUM));
-    PyDict_SetItemString(d,"PRINT_QUALITY_LOW", SWIG_FromInt((int)wxPRINT_QUALITY_LOW));
-    PyDict_SetItemString(d,"PRINT_QUALITY_DRAFT", SWIG_FromInt((int)wxPRINT_QUALITY_DRAFT));
-    PyDict_SetItemString(d,"ID_ANY", SWIG_FromInt((int)wxID_ANY));
-    PyDict_SetItemString(d,"ID_SEPARATOR", SWIG_FromInt((int)wxID_SEPARATOR));
-    PyDict_SetItemString(d,"ID_LOWEST", SWIG_FromInt((int)wxID_LOWEST));
-    PyDict_SetItemString(d,"ID_OPEN", SWIG_FromInt((int)wxID_OPEN));
-    PyDict_SetItemString(d,"ID_CLOSE", SWIG_FromInt((int)wxID_CLOSE));
-    PyDict_SetItemString(d,"ID_NEW", SWIG_FromInt((int)wxID_NEW));
-    PyDict_SetItemString(d,"ID_SAVE", SWIG_FromInt((int)wxID_SAVE));
-    PyDict_SetItemString(d,"ID_SAVEAS", SWIG_FromInt((int)wxID_SAVEAS));
-    PyDict_SetItemString(d,"ID_REVERT", SWIG_FromInt((int)wxID_REVERT));
-    PyDict_SetItemString(d,"ID_EXIT", SWIG_FromInt((int)wxID_EXIT));
-    PyDict_SetItemString(d,"ID_UNDO", SWIG_FromInt((int)wxID_UNDO));
-    PyDict_SetItemString(d,"ID_REDO", SWIG_FromInt((int)wxID_REDO));
-    PyDict_SetItemString(d,"ID_HELP", SWIG_FromInt((int)wxID_HELP));
-    PyDict_SetItemString(d,"ID_PRINT", SWIG_FromInt((int)wxID_PRINT));
-    PyDict_SetItemString(d,"ID_PRINT_SETUP", SWIG_FromInt((int)wxID_PRINT_SETUP));
-    PyDict_SetItemString(d,"ID_PREVIEW", SWIG_FromInt((int)wxID_PREVIEW));
-    PyDict_SetItemString(d,"ID_ABOUT", SWIG_FromInt((int)wxID_ABOUT));
-    PyDict_SetItemString(d,"ID_HELP_CONTENTS", SWIG_FromInt((int)wxID_HELP_CONTENTS));
-    PyDict_SetItemString(d,"ID_HELP_COMMANDS", SWIG_FromInt((int)wxID_HELP_COMMANDS));
-    PyDict_SetItemString(d,"ID_HELP_PROCEDURES", SWIG_FromInt((int)wxID_HELP_PROCEDURES));
-    PyDict_SetItemString(d,"ID_HELP_CONTEXT", SWIG_FromInt((int)wxID_HELP_CONTEXT));
-    PyDict_SetItemString(d,"ID_CLOSE_ALL", SWIG_FromInt((int)wxID_CLOSE_ALL));
-    PyDict_SetItemString(d,"ID_PREFERENCES", SWIG_FromInt((int)wxID_PREFERENCES));
-    PyDict_SetItemString(d,"ID_CUT", SWIG_FromInt((int)wxID_CUT));
-    PyDict_SetItemString(d,"ID_COPY", SWIG_FromInt((int)wxID_COPY));
-    PyDict_SetItemString(d,"ID_PASTE", SWIG_FromInt((int)wxID_PASTE));
-    PyDict_SetItemString(d,"ID_CLEAR", SWIG_FromInt((int)wxID_CLEAR));
-    PyDict_SetItemString(d,"ID_FIND", SWIG_FromInt((int)wxID_FIND));
-    PyDict_SetItemString(d,"ID_DUPLICATE", SWIG_FromInt((int)wxID_DUPLICATE));
-    PyDict_SetItemString(d,"ID_SELECTALL", SWIG_FromInt((int)wxID_SELECTALL));
-    PyDict_SetItemString(d,"ID_DELETE", SWIG_FromInt((int)wxID_DELETE));
-    PyDict_SetItemString(d,"ID_REPLACE", SWIG_FromInt((int)wxID_REPLACE));
-    PyDict_SetItemString(d,"ID_REPLACE_ALL", SWIG_FromInt((int)wxID_REPLACE_ALL));
-    PyDict_SetItemString(d,"ID_PROPERTIES", SWIG_FromInt((int)wxID_PROPERTIES));
-    PyDict_SetItemString(d,"ID_VIEW_DETAILS", SWIG_FromInt((int)wxID_VIEW_DETAILS));
-    PyDict_SetItemString(d,"ID_VIEW_LARGEICONS", SWIG_FromInt((int)wxID_VIEW_LARGEICONS));
-    PyDict_SetItemString(d,"ID_VIEW_SMALLICONS", SWIG_FromInt((int)wxID_VIEW_SMALLICONS));
-    PyDict_SetItemString(d,"ID_VIEW_LIST", SWIG_FromInt((int)wxID_VIEW_LIST));
-    PyDict_SetItemString(d,"ID_VIEW_SORTDATE", SWIG_FromInt((int)wxID_VIEW_SORTDATE));
-    PyDict_SetItemString(d,"ID_VIEW_SORTNAME", SWIG_FromInt((int)wxID_VIEW_SORTNAME));
-    PyDict_SetItemString(d,"ID_VIEW_SORTSIZE", SWIG_FromInt((int)wxID_VIEW_SORTSIZE));
-    PyDict_SetItemString(d,"ID_VIEW_SORTTYPE", SWIG_FromInt((int)wxID_VIEW_SORTTYPE));
-    PyDict_SetItemString(d,"ID_FILE1", SWIG_FromInt((int)wxID_FILE1));
-    PyDict_SetItemString(d,"ID_FILE2", SWIG_FromInt((int)wxID_FILE2));
-    PyDict_SetItemString(d,"ID_FILE3", SWIG_FromInt((int)wxID_FILE3));
-    PyDict_SetItemString(d,"ID_FILE4", SWIG_FromInt((int)wxID_FILE4));
-    PyDict_SetItemString(d,"ID_FILE5", SWIG_FromInt((int)wxID_FILE5));
-    PyDict_SetItemString(d,"ID_FILE6", SWIG_FromInt((int)wxID_FILE6));
-    PyDict_SetItemString(d,"ID_FILE7", SWIG_FromInt((int)wxID_FILE7));
-    PyDict_SetItemString(d,"ID_FILE8", SWIG_FromInt((int)wxID_FILE8));
-    PyDict_SetItemString(d,"ID_FILE9", SWIG_FromInt((int)wxID_FILE9));
-    PyDict_SetItemString(d,"ID_OK", SWIG_FromInt((int)wxID_OK));
-    PyDict_SetItemString(d,"ID_CANCEL", SWIG_FromInt((int)wxID_CANCEL));
-    PyDict_SetItemString(d,"ID_APPLY", SWIG_FromInt((int)wxID_APPLY));
-    PyDict_SetItemString(d,"ID_YES", SWIG_FromInt((int)wxID_YES));
-    PyDict_SetItemString(d,"ID_NO", SWIG_FromInt((int)wxID_NO));
-    PyDict_SetItemString(d,"ID_STATIC", SWIG_FromInt((int)wxID_STATIC));
-    PyDict_SetItemString(d,"ID_FORWARD", SWIG_FromInt((int)wxID_FORWARD));
-    PyDict_SetItemString(d,"ID_BACKWARD", SWIG_FromInt((int)wxID_BACKWARD));
-    PyDict_SetItemString(d,"ID_DEFAULT", SWIG_FromInt((int)wxID_DEFAULT));
-    PyDict_SetItemString(d,"ID_MORE", SWIG_FromInt((int)wxID_MORE));
-    PyDict_SetItemString(d,"ID_SETUP", SWIG_FromInt((int)wxID_SETUP));
-    PyDict_SetItemString(d,"ID_RESET", SWIG_FromInt((int)wxID_RESET));
-    PyDict_SetItemString(d,"ID_CONTEXT_HELP", SWIG_FromInt((int)wxID_CONTEXT_HELP));
-    PyDict_SetItemString(d,"ID_YESTOALL", SWIG_FromInt((int)wxID_YESTOALL));
-    PyDict_SetItemString(d,"ID_NOTOALL", SWIG_FromInt((int)wxID_NOTOALL));
-    PyDict_SetItemString(d,"ID_ABORT", SWIG_FromInt((int)wxID_ABORT));
-    PyDict_SetItemString(d,"ID_RETRY", SWIG_FromInt((int)wxID_RETRY));
-    PyDict_SetItemString(d,"ID_IGNORE", SWIG_FromInt((int)wxID_IGNORE));
-    PyDict_SetItemString(d,"ID_ADD", SWIG_FromInt((int)wxID_ADD));
-    PyDict_SetItemString(d,"ID_REMOVE", SWIG_FromInt((int)wxID_REMOVE));
-    PyDict_SetItemString(d,"ID_UP", SWIG_FromInt((int)wxID_UP));
-    PyDict_SetItemString(d,"ID_DOWN", SWIG_FromInt((int)wxID_DOWN));
-    PyDict_SetItemString(d,"ID_HOME", SWIG_FromInt((int)wxID_HOME));
-    PyDict_SetItemString(d,"ID_REFRESH", SWIG_FromInt((int)wxID_REFRESH));
-    PyDict_SetItemString(d,"ID_STOP", SWIG_FromInt((int)wxID_STOP));
-    PyDict_SetItemString(d,"ID_INDEX", SWIG_FromInt((int)wxID_INDEX));
-    PyDict_SetItemString(d,"ID_BOLD", SWIG_FromInt((int)wxID_BOLD));
-    PyDict_SetItemString(d,"ID_ITALIC", SWIG_FromInt((int)wxID_ITALIC));
-    PyDict_SetItemString(d,"ID_JUSTIFY_CENTER", SWIG_FromInt((int)wxID_JUSTIFY_CENTER));
-    PyDict_SetItemString(d,"ID_JUSTIFY_FILL", SWIG_FromInt((int)wxID_JUSTIFY_FILL));
-    PyDict_SetItemString(d,"ID_JUSTIFY_RIGHT", SWIG_FromInt((int)wxID_JUSTIFY_RIGHT));
-    PyDict_SetItemString(d,"ID_JUSTIFY_LEFT", SWIG_FromInt((int)wxID_JUSTIFY_LEFT));
-    PyDict_SetItemString(d,"ID_UNDERLINE", SWIG_FromInt((int)wxID_UNDERLINE));
-    PyDict_SetItemString(d,"ID_INDENT", SWIG_FromInt((int)wxID_INDENT));
-    PyDict_SetItemString(d,"ID_UNINDENT", SWIG_FromInt((int)wxID_UNINDENT));
-    PyDict_SetItemString(d,"ID_ZOOM_100", SWIG_FromInt((int)wxID_ZOOM_100));
-    PyDict_SetItemString(d,"ID_ZOOM_FIT", SWIG_FromInt((int)wxID_ZOOM_FIT));
-    PyDict_SetItemString(d,"ID_ZOOM_IN", SWIG_FromInt((int)wxID_ZOOM_IN));
-    PyDict_SetItemString(d,"ID_ZOOM_OUT", SWIG_FromInt((int)wxID_ZOOM_OUT));
-    PyDict_SetItemString(d,"ID_UNDELETE", SWIG_FromInt((int)wxID_UNDELETE));
-    PyDict_SetItemString(d,"ID_REVERT_TO_SAVED", SWIG_FromInt((int)wxID_REVERT_TO_SAVED));
-    PyDict_SetItemString(d,"ID_HIGHEST", SWIG_FromInt((int)wxID_HIGHEST));
-    PyDict_SetItemString(d,"OPEN", SWIG_FromInt((int)wxOPEN));
-    PyDict_SetItemString(d,"SAVE", SWIG_FromInt((int)wxSAVE));
-    PyDict_SetItemString(d,"HIDE_READONLY", SWIG_FromInt((int)wxHIDE_READONLY));
-    PyDict_SetItemString(d,"OVERWRITE_PROMPT", SWIG_FromInt((int)wxOVERWRITE_PROMPT));
-    PyDict_SetItemString(d,"FILE_MUST_EXIST", SWIG_FromInt((int)wxFILE_MUST_EXIST));
-    PyDict_SetItemString(d,"MULTIPLE", SWIG_FromInt((int)wxMULTIPLE));
-    PyDict_SetItemString(d,"CHANGE_DIR", SWIG_FromInt((int)wxCHANGE_DIR));
-    PyDict_SetItemString(d,"ACCEL_ALT", SWIG_FromInt((int)wxACCEL_ALT));
-    PyDict_SetItemString(d,"ACCEL_CTRL", SWIG_FromInt((int)wxACCEL_CTRL));
-    PyDict_SetItemString(d,"ACCEL_SHIFT", SWIG_FromInt((int)wxACCEL_SHIFT));
-    PyDict_SetItemString(d,"ACCEL_NORMAL", SWIG_FromInt((int)wxACCEL_NORMAL));
-    PyDict_SetItemString(d,"PD_AUTO_HIDE", SWIG_FromInt((int)wxPD_AUTO_HIDE));
-    PyDict_SetItemString(d,"PD_APP_MODAL", SWIG_FromInt((int)wxPD_APP_MODAL));
-    PyDict_SetItemString(d,"PD_CAN_ABORT", SWIG_FromInt((int)wxPD_CAN_ABORT));
-    PyDict_SetItemString(d,"PD_ELAPSED_TIME", SWIG_FromInt((int)wxPD_ELAPSED_TIME));
-    PyDict_SetItemString(d,"PD_ESTIMATED_TIME", SWIG_FromInt((int)wxPD_ESTIMATED_TIME));
-    PyDict_SetItemString(d,"PD_REMAINING_TIME", SWIG_FromInt((int)wxPD_REMAINING_TIME));
-    PyDict_SetItemString(d,"DD_NEW_DIR_BUTTON", SWIG_FromInt((int)wxDD_NEW_DIR_BUTTON));
-    PyDict_SetItemString(d,"DD_DEFAULT_STYLE", SWIG_FromInt((int)wxDD_DEFAULT_STYLE));
-    PyDict_SetItemString(d,"MENU_TEAROFF", SWIG_FromInt((int)wxMENU_TEAROFF));
-    PyDict_SetItemString(d,"MB_DOCKABLE", SWIG_FromInt((int)wxMB_DOCKABLE));
-    PyDict_SetItemString(d,"NO_FULL_REPAINT_ON_RESIZE", SWIG_FromInt((int)wxNO_FULL_REPAINT_ON_RESIZE));
-    PyDict_SetItemString(d,"FULL_REPAINT_ON_RESIZE", SWIG_FromInt((int)wxFULL_REPAINT_ON_RESIZE));
-    PyDict_SetItemString(d,"LI_HORIZONTAL", SWIG_FromInt((int)wxLI_HORIZONTAL));
-    PyDict_SetItemString(d,"LI_VERTICAL", SWIG_FromInt((int)wxLI_VERTICAL));
-    PyDict_SetItemString(d,"WS_EX_VALIDATE_RECURSIVELY", SWIG_FromInt((int)wxWS_EX_VALIDATE_RECURSIVELY));
-    PyDict_SetItemString(d,"WS_EX_BLOCK_EVENTS", SWIG_FromInt((int)wxWS_EX_BLOCK_EVENTS));
-    PyDict_SetItemString(d,"WS_EX_TRANSIENT", SWIG_FromInt((int)wxWS_EX_TRANSIENT));
-    PyDict_SetItemString(d,"WS_EX_THEMED_BACKGROUND", SWIG_FromInt((int)wxWS_EX_THEMED_BACKGROUND));
-    PyDict_SetItemString(d,"WS_EX_PROCESS_IDLE", SWIG_FromInt((int)wxWS_EX_PROCESS_IDLE));
-    PyDict_SetItemString(d,"WS_EX_PROCESS_UI_UPDATES", SWIG_FromInt((int)wxWS_EX_PROCESS_UI_UPDATES));
-    PyDict_SetItemString(d,"MM_TEXT", SWIG_FromInt((int)wxMM_TEXT));
-    PyDict_SetItemString(d,"MM_LOMETRIC", SWIG_FromInt((int)wxMM_LOMETRIC));
-    PyDict_SetItemString(d,"MM_HIMETRIC", SWIG_FromInt((int)wxMM_HIMETRIC));
-    PyDict_SetItemString(d,"MM_LOENGLISH", SWIG_FromInt((int)wxMM_LOENGLISH));
-    PyDict_SetItemString(d,"MM_HIENGLISH", SWIG_FromInt((int)wxMM_HIENGLISH));
-    PyDict_SetItemString(d,"MM_TWIPS", SWIG_FromInt((int)wxMM_TWIPS));
-    PyDict_SetItemString(d,"MM_ISOTROPIC", SWIG_FromInt((int)wxMM_ISOTROPIC));
-    PyDict_SetItemString(d,"MM_ANISOTROPIC", SWIG_FromInt((int)wxMM_ANISOTROPIC));
-    PyDict_SetItemString(d,"MM_POINTS", SWIG_FromInt((int)wxMM_POINTS));
-    PyDict_SetItemString(d,"MM_METRIC", SWIG_FromInt((int)wxMM_METRIC));
-    PyDict_SetItemString(d,"CENTRE", SWIG_FromInt((int)wxCENTRE));
-    PyDict_SetItemString(d,"CENTER", SWIG_FromInt((int)wxCENTER));
-    PyDict_SetItemString(d,"HORIZONTAL", SWIG_FromInt((int)wxHORIZONTAL));
-    PyDict_SetItemString(d,"VERTICAL", SWIG_FromInt((int)wxVERTICAL));
-    PyDict_SetItemString(d,"BOTH", SWIG_FromInt((int)wxBOTH));
-    PyDict_SetItemString(d,"LEFT", SWIG_FromInt((int)wxLEFT));
-    PyDict_SetItemString(d,"RIGHT", SWIG_FromInt((int)wxRIGHT));
-    PyDict_SetItemString(d,"UP", SWIG_FromInt((int)wxUP));
-    PyDict_SetItemString(d,"DOWN", SWIG_FromInt((int)wxDOWN));
-    PyDict_SetItemString(d,"TOP", SWIG_FromInt((int)wxTOP));
-    PyDict_SetItemString(d,"BOTTOM", SWIG_FromInt((int)wxBOTTOM));
-    PyDict_SetItemString(d,"NORTH", SWIG_FromInt((int)wxNORTH));
-    PyDict_SetItemString(d,"SOUTH", SWIG_FromInt((int)wxSOUTH));
-    PyDict_SetItemString(d,"WEST", SWIG_FromInt((int)wxWEST));
-    PyDict_SetItemString(d,"EAST", SWIG_FromInt((int)wxEAST));
-    PyDict_SetItemString(d,"ALL", SWIG_FromInt((int)wxALL));
-    PyDict_SetItemString(d,"ALIGN_NOT", SWIG_FromInt((int)wxALIGN_NOT));
-    PyDict_SetItemString(d,"ALIGN_CENTER_HORIZONTAL", SWIG_FromInt((int)wxALIGN_CENTER_HORIZONTAL));
-    PyDict_SetItemString(d,"ALIGN_CENTRE_HORIZONTAL", SWIG_FromInt((int)wxALIGN_CENTRE_HORIZONTAL));
-    PyDict_SetItemString(d,"ALIGN_LEFT", SWIG_FromInt((int)wxALIGN_LEFT));
-    PyDict_SetItemString(d,"ALIGN_TOP", SWIG_FromInt((int)wxALIGN_TOP));
-    PyDict_SetItemString(d,"ALIGN_RIGHT", SWIG_FromInt((int)wxALIGN_RIGHT));
-    PyDict_SetItemString(d,"ALIGN_BOTTOM", SWIG_FromInt((int)wxALIGN_BOTTOM));
-    PyDict_SetItemString(d,"ALIGN_CENTER_VERTICAL", SWIG_FromInt((int)wxALIGN_CENTER_VERTICAL));
-    PyDict_SetItemString(d,"ALIGN_CENTRE_VERTICAL", SWIG_FromInt((int)wxALIGN_CENTRE_VERTICAL));
-    PyDict_SetItemString(d,"ALIGN_CENTER", SWIG_FromInt((int)wxALIGN_CENTER));
-    PyDict_SetItemString(d,"ALIGN_CENTRE", SWIG_FromInt((int)wxALIGN_CENTRE));
-    PyDict_SetItemString(d,"ALIGN_MASK", SWIG_FromInt((int)wxALIGN_MASK));
-    PyDict_SetItemString(d,"STRETCH_NOT", SWIG_FromInt((int)wxSTRETCH_NOT));
-    PyDict_SetItemString(d,"SHRINK", SWIG_FromInt((int)wxSHRINK));
-    PyDict_SetItemString(d,"GROW", SWIG_FromInt((int)wxGROW));
-    PyDict_SetItemString(d,"EXPAND", SWIG_FromInt((int)wxEXPAND));
-    PyDict_SetItemString(d,"SHAPED", SWIG_FromInt((int)wxSHAPED));
-    PyDict_SetItemString(d,"FIXED_MINSIZE", SWIG_FromInt((int)wxFIXED_MINSIZE));
-    PyDict_SetItemString(d,"TILE", SWIG_FromInt((int)wxTILE));
-    PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_FromInt((int)wxADJUST_MINSIZE));
-    PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_FromInt((int)wxBORDER_DEFAULT));
-    PyDict_SetItemString(d,"BORDER_NONE", SWIG_FromInt((int)wxBORDER_NONE));
-    PyDict_SetItemString(d,"BORDER_STATIC", SWIG_FromInt((int)wxBORDER_STATIC));
-    PyDict_SetItemString(d,"BORDER_SIMPLE", SWIG_FromInt((int)wxBORDER_SIMPLE));
-    PyDict_SetItemString(d,"BORDER_RAISED", SWIG_FromInt((int)wxBORDER_RAISED));
-    PyDict_SetItemString(d,"BORDER_SUNKEN", SWIG_FromInt((int)wxBORDER_SUNKEN));
-    PyDict_SetItemString(d,"BORDER_DOUBLE", SWIG_FromInt((int)wxBORDER_DOUBLE));
-    PyDict_SetItemString(d,"BORDER_MASK", SWIG_FromInt((int)wxBORDER_MASK));
-    PyDict_SetItemString(d,"BG_STYLE_SYSTEM", SWIG_FromInt((int)wxBG_STYLE_SYSTEM));
-    PyDict_SetItemString(d,"BG_STYLE_COLOUR", SWIG_FromInt((int)wxBG_STYLE_COLOUR));
-    PyDict_SetItemString(d,"BG_STYLE_CUSTOM", SWIG_FromInt((int)wxBG_STYLE_CUSTOM));
-    PyDict_SetItemString(d,"DEFAULT", SWIG_FromInt((int)wxDEFAULT));
-    PyDict_SetItemString(d,"DECORATIVE", SWIG_FromInt((int)wxDECORATIVE));
-    PyDict_SetItemString(d,"ROMAN", SWIG_FromInt((int)wxROMAN));
-    PyDict_SetItemString(d,"SCRIPT", SWIG_FromInt((int)wxSCRIPT));
-    PyDict_SetItemString(d,"SWISS", SWIG_FromInt((int)wxSWISS));
-    PyDict_SetItemString(d,"MODERN", SWIG_FromInt((int)wxMODERN));
-    PyDict_SetItemString(d,"TELETYPE", SWIG_FromInt((int)wxTELETYPE));
-    PyDict_SetItemString(d,"VARIABLE", SWIG_FromInt((int)wxVARIABLE));
-    PyDict_SetItemString(d,"FIXED", SWIG_FromInt((int)wxFIXED));
-    PyDict_SetItemString(d,"NORMAL", SWIG_FromInt((int)wxNORMAL));
-    PyDict_SetItemString(d,"LIGHT", SWIG_FromInt((int)wxLIGHT));
-    PyDict_SetItemString(d,"BOLD", SWIG_FromInt((int)wxBOLD));
-    PyDict_SetItemString(d,"ITALIC", SWIG_FromInt((int)wxITALIC));
-    PyDict_SetItemString(d,"SLANT", SWIG_FromInt((int)wxSLANT));
-    PyDict_SetItemString(d,"SOLID", SWIG_FromInt((int)wxSOLID));
-    PyDict_SetItemString(d,"DOT", SWIG_FromInt((int)wxDOT));
-    PyDict_SetItemString(d,"LONG_DASH", SWIG_FromInt((int)wxLONG_DASH));
-    PyDict_SetItemString(d,"SHORT_DASH", SWIG_FromInt((int)wxSHORT_DASH));
-    PyDict_SetItemString(d,"DOT_DASH", SWIG_FromInt((int)wxDOT_DASH));
-    PyDict_SetItemString(d,"USER_DASH", SWIG_FromInt((int)wxUSER_DASH));
-    PyDict_SetItemString(d,"TRANSPARENT", SWIG_FromInt((int)wxTRANSPARENT));
-    PyDict_SetItemString(d,"STIPPLE", SWIG_FromInt((int)wxSTIPPLE));
-    PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_FromInt((int)wxBDIAGONAL_HATCH));
-    PyDict_SetItemString(d,"CROSSDIAG_HATCH", SWIG_FromInt((int)wxCROSSDIAG_HATCH));
-    PyDict_SetItemString(d,"FDIAGONAL_HATCH", SWIG_FromInt((int)wxFDIAGONAL_HATCH));
-    PyDict_SetItemString(d,"CROSS_HATCH", SWIG_FromInt((int)wxCROSS_HATCH));
-    PyDict_SetItemString(d,"HORIZONTAL_HATCH", SWIG_FromInt((int)wxHORIZONTAL_HATCH));
-    PyDict_SetItemString(d,"VERTICAL_HATCH", SWIG_FromInt((int)wxVERTICAL_HATCH));
-    PyDict_SetItemString(d,"JOIN_BEVEL", SWIG_FromInt((int)wxJOIN_BEVEL));
-    PyDict_SetItemString(d,"JOIN_MITER", SWIG_FromInt((int)wxJOIN_MITER));
-    PyDict_SetItemString(d,"JOIN_ROUND", SWIG_FromInt((int)wxJOIN_ROUND));
-    PyDict_SetItemString(d,"CAP_ROUND", SWIG_FromInt((int)wxCAP_ROUND));
-    PyDict_SetItemString(d,"CAP_PROJECTING", SWIG_FromInt((int)wxCAP_PROJECTING));
-    PyDict_SetItemString(d,"CAP_BUTT", SWIG_FromInt((int)wxCAP_BUTT));
-    PyDict_SetItemString(d,"CLEAR", SWIG_FromInt((int)wxCLEAR));
-    PyDict_SetItemString(d,"XOR", SWIG_FromInt((int)wxXOR));
-    PyDict_SetItemString(d,"INVERT", SWIG_FromInt((int)wxINVERT));
-    PyDict_SetItemString(d,"OR_REVERSE", SWIG_FromInt((int)wxOR_REVERSE));
-    PyDict_SetItemString(d,"AND_REVERSE", SWIG_FromInt((int)wxAND_REVERSE));
-    PyDict_SetItemString(d,"COPY", SWIG_FromInt((int)wxCOPY));
-    PyDict_SetItemString(d,"AND", SWIG_FromInt((int)wxAND));
-    PyDict_SetItemString(d,"AND_INVERT", SWIG_FromInt((int)wxAND_INVERT));
-    PyDict_SetItemString(d,"NO_OP", SWIG_FromInt((int)wxNO_OP));
-    PyDict_SetItemString(d,"NOR", SWIG_FromInt((int)wxNOR));
-    PyDict_SetItemString(d,"EQUIV", SWIG_FromInt((int)wxEQUIV));
-    PyDict_SetItemString(d,"SRC_INVERT", SWIG_FromInt((int)wxSRC_INVERT));
-    PyDict_SetItemString(d,"OR_INVERT", SWIG_FromInt((int)wxOR_INVERT));
-    PyDict_SetItemString(d,"NAND", SWIG_FromInt((int)wxNAND));
-    PyDict_SetItemString(d,"OR", SWIG_FromInt((int)wxOR));
-    PyDict_SetItemString(d,"SET", SWIG_FromInt((int)wxSET));
-    PyDict_SetItemString(d,"WXK_BACK", SWIG_FromInt((int)WXK_BACK));
-    PyDict_SetItemString(d,"WXK_TAB", SWIG_FromInt((int)WXK_TAB));
-    PyDict_SetItemString(d,"WXK_RETURN", SWIG_FromInt((int)WXK_RETURN));
-    PyDict_SetItemString(d,"WXK_ESCAPE", SWIG_FromInt((int)WXK_ESCAPE));
-    PyDict_SetItemString(d,"WXK_SPACE", SWIG_FromInt((int)WXK_SPACE));
-    PyDict_SetItemString(d,"WXK_DELETE", SWIG_FromInt((int)WXK_DELETE));
-    PyDict_SetItemString(d,"WXK_START", SWIG_FromInt((int)WXK_START));
-    PyDict_SetItemString(d,"WXK_LBUTTON", SWIG_FromInt((int)WXK_LBUTTON));
-    PyDict_SetItemString(d,"WXK_RBUTTON", SWIG_FromInt((int)WXK_RBUTTON));
-    PyDict_SetItemString(d,"WXK_CANCEL", SWIG_FromInt((int)WXK_CANCEL));
-    PyDict_SetItemString(d,"WXK_MBUTTON", SWIG_FromInt((int)WXK_MBUTTON));
-    PyDict_SetItemString(d,"WXK_CLEAR", SWIG_FromInt((int)WXK_CLEAR));
-    PyDict_SetItemString(d,"WXK_SHIFT", SWIG_FromInt((int)WXK_SHIFT));
-    PyDict_SetItemString(d,"WXK_ALT", SWIG_FromInt((int)WXK_ALT));
-    PyDict_SetItemString(d,"WXK_CONTROL", SWIG_FromInt((int)WXK_CONTROL));
-    PyDict_SetItemString(d,"WXK_MENU", SWIG_FromInt((int)WXK_MENU));
-    PyDict_SetItemString(d,"WXK_PAUSE", SWIG_FromInt((int)WXK_PAUSE));
-    PyDict_SetItemString(d,"WXK_CAPITAL", SWIG_FromInt((int)WXK_CAPITAL));
-    PyDict_SetItemString(d,"WXK_PRIOR", SWIG_FromInt((int)WXK_PRIOR));
-    PyDict_SetItemString(d,"WXK_NEXT", SWIG_FromInt((int)WXK_NEXT));
-    PyDict_SetItemString(d,"WXK_END", SWIG_FromInt((int)WXK_END));
-    PyDict_SetItemString(d,"WXK_HOME", SWIG_FromInt((int)WXK_HOME));
-    PyDict_SetItemString(d,"WXK_LEFT", SWIG_FromInt((int)WXK_LEFT));
-    PyDict_SetItemString(d,"WXK_UP", SWIG_FromInt((int)WXK_UP));
-    PyDict_SetItemString(d,"WXK_RIGHT", SWIG_FromInt((int)WXK_RIGHT));
-    PyDict_SetItemString(d,"WXK_DOWN", SWIG_FromInt((int)WXK_DOWN));
-    PyDict_SetItemString(d,"WXK_SELECT", SWIG_FromInt((int)WXK_SELECT));
-    PyDict_SetItemString(d,"WXK_PRINT", SWIG_FromInt((int)WXK_PRINT));
-    PyDict_SetItemString(d,"WXK_EXECUTE", SWIG_FromInt((int)WXK_EXECUTE));
-    PyDict_SetItemString(d,"WXK_SNAPSHOT", SWIG_FromInt((int)WXK_SNAPSHOT));
-    PyDict_SetItemString(d,"WXK_INSERT", SWIG_FromInt((int)WXK_INSERT));
-    PyDict_SetItemString(d,"WXK_HELP", SWIG_FromInt((int)WXK_HELP));
-    PyDict_SetItemString(d,"WXK_NUMPAD0", SWIG_FromInt((int)WXK_NUMPAD0));
-    PyDict_SetItemString(d,"WXK_NUMPAD1", SWIG_FromInt((int)WXK_NUMPAD1));
-    PyDict_SetItemString(d,"WXK_NUMPAD2", SWIG_FromInt((int)WXK_NUMPAD2));
-    PyDict_SetItemString(d,"WXK_NUMPAD3", SWIG_FromInt((int)WXK_NUMPAD3));
-    PyDict_SetItemString(d,"WXK_NUMPAD4", SWIG_FromInt((int)WXK_NUMPAD4));
-    PyDict_SetItemString(d,"WXK_NUMPAD5", SWIG_FromInt((int)WXK_NUMPAD5));
-    PyDict_SetItemString(d,"WXK_NUMPAD6", SWIG_FromInt((int)WXK_NUMPAD6));
-    PyDict_SetItemString(d,"WXK_NUMPAD7", SWIG_FromInt((int)WXK_NUMPAD7));
-    PyDict_SetItemString(d,"WXK_NUMPAD8", SWIG_FromInt((int)WXK_NUMPAD8));
-    PyDict_SetItemString(d,"WXK_NUMPAD9", SWIG_FromInt((int)WXK_NUMPAD9));
-    PyDict_SetItemString(d,"WXK_MULTIPLY", SWIG_FromInt((int)WXK_MULTIPLY));
-    PyDict_SetItemString(d,"WXK_ADD", SWIG_FromInt((int)WXK_ADD));
-    PyDict_SetItemString(d,"WXK_SEPARATOR", SWIG_FromInt((int)WXK_SEPARATOR));
-    PyDict_SetItemString(d,"WXK_SUBTRACT", SWIG_FromInt((int)WXK_SUBTRACT));
-    PyDict_SetItemString(d,"WXK_DECIMAL", SWIG_FromInt((int)WXK_DECIMAL));
-    PyDict_SetItemString(d,"WXK_DIVIDE", SWIG_FromInt((int)WXK_DIVIDE));
-    PyDict_SetItemString(d,"WXK_F1", SWIG_FromInt((int)WXK_F1));
-    PyDict_SetItemString(d,"WXK_F2", SWIG_FromInt((int)WXK_F2));
-    PyDict_SetItemString(d,"WXK_F3", SWIG_FromInt((int)WXK_F3));
-    PyDict_SetItemString(d,"WXK_F4", SWIG_FromInt((int)WXK_F4));
-    PyDict_SetItemString(d,"WXK_F5", SWIG_FromInt((int)WXK_F5));
-    PyDict_SetItemString(d,"WXK_F6", SWIG_FromInt((int)WXK_F6));
-    PyDict_SetItemString(d,"WXK_F7", SWIG_FromInt((int)WXK_F7));
-    PyDict_SetItemString(d,"WXK_F8", SWIG_FromInt((int)WXK_F8));
-    PyDict_SetItemString(d,"WXK_F9", SWIG_FromInt((int)WXK_F9));
-    PyDict_SetItemString(d,"WXK_F10", SWIG_FromInt((int)WXK_F10));
-    PyDict_SetItemString(d,"WXK_F11", SWIG_FromInt((int)WXK_F11));
-    PyDict_SetItemString(d,"WXK_F12", SWIG_FromInt((int)WXK_F12));
-    PyDict_SetItemString(d,"WXK_F13", SWIG_FromInt((int)WXK_F13));
-    PyDict_SetItemString(d,"WXK_F14", SWIG_FromInt((int)WXK_F14));
-    PyDict_SetItemString(d,"WXK_F15", SWIG_FromInt((int)WXK_F15));
-    PyDict_SetItemString(d,"WXK_F16", SWIG_FromInt((int)WXK_F16));
-    PyDict_SetItemString(d,"WXK_F17", SWIG_FromInt((int)WXK_F17));
-    PyDict_SetItemString(d,"WXK_F18", SWIG_FromInt((int)WXK_F18));
-    PyDict_SetItemString(d,"WXK_F19", SWIG_FromInt((int)WXK_F19));
-    PyDict_SetItemString(d,"WXK_F20", SWIG_FromInt((int)WXK_F20));
-    PyDict_SetItemString(d,"WXK_F21", SWIG_FromInt((int)WXK_F21));
-    PyDict_SetItemString(d,"WXK_F22", SWIG_FromInt((int)WXK_F22));
-    PyDict_SetItemString(d,"WXK_F23", SWIG_FromInt((int)WXK_F23));
-    PyDict_SetItemString(d,"WXK_F24", SWIG_FromInt((int)WXK_F24));
-    PyDict_SetItemString(d,"WXK_NUMLOCK", SWIG_FromInt((int)WXK_NUMLOCK));
-    PyDict_SetItemString(d,"WXK_SCROLL", SWIG_FromInt((int)WXK_SCROLL));
-    PyDict_SetItemString(d,"WXK_PAGEUP", SWIG_FromInt((int)WXK_PAGEUP));
-    PyDict_SetItemString(d,"WXK_PAGEDOWN", SWIG_FromInt((int)WXK_PAGEDOWN));
-    PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", SWIG_FromInt((int)WXK_NUMPAD_SPACE));
-    PyDict_SetItemString(d,"WXK_NUMPAD_TAB", SWIG_FromInt((int)WXK_NUMPAD_TAB));
-    PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", SWIG_FromInt((int)WXK_NUMPAD_ENTER));
-    PyDict_SetItemString(d,"WXK_NUMPAD_F1", SWIG_FromInt((int)WXK_NUMPAD_F1));
-    PyDict_SetItemString(d,"WXK_NUMPAD_F2", SWIG_FromInt((int)WXK_NUMPAD_F2));
-    PyDict_SetItemString(d,"WXK_NUMPAD_F3", SWIG_FromInt((int)WXK_NUMPAD_F3));
-    PyDict_SetItemString(d,"WXK_NUMPAD_F4", SWIG_FromInt((int)WXK_NUMPAD_F4));
-    PyDict_SetItemString(d,"WXK_NUMPAD_HOME", SWIG_FromInt((int)WXK_NUMPAD_HOME));
-    PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", SWIG_FromInt((int)WXK_NUMPAD_LEFT));
-    PyDict_SetItemString(d,"WXK_NUMPAD_UP", SWIG_FromInt((int)WXK_NUMPAD_UP));
-    PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", SWIG_FromInt((int)WXK_NUMPAD_RIGHT));
-    PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", SWIG_FromInt((int)WXK_NUMPAD_DOWN));
-    PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", SWIG_FromInt((int)WXK_NUMPAD_PRIOR));
-    PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", SWIG_FromInt((int)WXK_NUMPAD_PAGEUP));
-    PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", SWIG_FromInt((int)WXK_NUMPAD_NEXT));
-    PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", SWIG_FromInt((int)WXK_NUMPAD_PAGEDOWN));
-    PyDict_SetItemString(d,"WXK_NUMPAD_END", SWIG_FromInt((int)WXK_NUMPAD_END));
-    PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", SWIG_FromInt((int)WXK_NUMPAD_BEGIN));
-    PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", SWIG_FromInt((int)WXK_NUMPAD_INSERT));
-    PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", SWIG_FromInt((int)WXK_NUMPAD_DELETE));
-    PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", SWIG_FromInt((int)WXK_NUMPAD_EQUAL));
-    PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", SWIG_FromInt((int)WXK_NUMPAD_MULTIPLY));
-    PyDict_SetItemString(d,"WXK_NUMPAD_ADD", SWIG_FromInt((int)WXK_NUMPAD_ADD));
-    PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", SWIG_FromInt((int)WXK_NUMPAD_SEPARATOR));
-    PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", SWIG_FromInt((int)WXK_NUMPAD_SUBTRACT));
-    PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", SWIG_FromInt((int)WXK_NUMPAD_DECIMAL));
-    PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", SWIG_FromInt((int)WXK_NUMPAD_DIVIDE));
-    PyDict_SetItemString(d,"WXK_WINDOWS_LEFT", SWIG_FromInt((int)WXK_WINDOWS_LEFT));
-    PyDict_SetItemString(d,"WXK_WINDOWS_RIGHT", SWIG_FromInt((int)WXK_WINDOWS_RIGHT));
-    PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_FromInt((int)WXK_WINDOWS_MENU));
-    PyDict_SetItemString(d,"PAPER_NONE", SWIG_FromInt((int)wxPAPER_NONE));
-    PyDict_SetItemString(d,"PAPER_LETTER", SWIG_FromInt((int)wxPAPER_LETTER));
-    PyDict_SetItemString(d,"PAPER_LEGAL", SWIG_FromInt((int)wxPAPER_LEGAL));
-    PyDict_SetItemString(d,"PAPER_A4", SWIG_FromInt((int)wxPAPER_A4));
-    PyDict_SetItemString(d,"PAPER_CSHEET", SWIG_FromInt((int)wxPAPER_CSHEET));
-    PyDict_SetItemString(d,"PAPER_DSHEET", SWIG_FromInt((int)wxPAPER_DSHEET));
-    PyDict_SetItemString(d,"PAPER_ESHEET", SWIG_FromInt((int)wxPAPER_ESHEET));
-    PyDict_SetItemString(d,"PAPER_LETTERSMALL", SWIG_FromInt((int)wxPAPER_LETTERSMALL));
-    PyDict_SetItemString(d,"PAPER_TABLOID", SWIG_FromInt((int)wxPAPER_TABLOID));
-    PyDict_SetItemString(d,"PAPER_LEDGER", SWIG_FromInt((int)wxPAPER_LEDGER));
-    PyDict_SetItemString(d,"PAPER_STATEMENT", SWIG_FromInt((int)wxPAPER_STATEMENT));
-    PyDict_SetItemString(d,"PAPER_EXECUTIVE", SWIG_FromInt((int)wxPAPER_EXECUTIVE));
-    PyDict_SetItemString(d,"PAPER_A3", SWIG_FromInt((int)wxPAPER_A3));
-    PyDict_SetItemString(d,"PAPER_A4SMALL", SWIG_FromInt((int)wxPAPER_A4SMALL));
-    PyDict_SetItemString(d,"PAPER_A5", SWIG_FromInt((int)wxPAPER_A5));
-    PyDict_SetItemString(d,"PAPER_B4", SWIG_FromInt((int)wxPAPER_B4));
-    PyDict_SetItemString(d,"PAPER_B5", SWIG_FromInt((int)wxPAPER_B5));
-    PyDict_SetItemString(d,"PAPER_FOLIO", SWIG_FromInt((int)wxPAPER_FOLIO));
-    PyDict_SetItemString(d,"PAPER_QUARTO", SWIG_FromInt((int)wxPAPER_QUARTO));
-    PyDict_SetItemString(d,"PAPER_10X14", SWIG_FromInt((int)wxPAPER_10X14));
-    PyDict_SetItemString(d,"PAPER_11X17", SWIG_FromInt((int)wxPAPER_11X17));
-    PyDict_SetItemString(d,"PAPER_NOTE", SWIG_FromInt((int)wxPAPER_NOTE));
-    PyDict_SetItemString(d,"PAPER_ENV_9", SWIG_FromInt((int)wxPAPER_ENV_9));
-    PyDict_SetItemString(d,"PAPER_ENV_10", SWIG_FromInt((int)wxPAPER_ENV_10));
-    PyDict_SetItemString(d,"PAPER_ENV_11", SWIG_FromInt((int)wxPAPER_ENV_11));
-    PyDict_SetItemString(d,"PAPER_ENV_12", SWIG_FromInt((int)wxPAPER_ENV_12));
-    PyDict_SetItemString(d,"PAPER_ENV_14", SWIG_FromInt((int)wxPAPER_ENV_14));
-    PyDict_SetItemString(d,"PAPER_ENV_DL", SWIG_FromInt((int)wxPAPER_ENV_DL));
-    PyDict_SetItemString(d,"PAPER_ENV_C5", SWIG_FromInt((int)wxPAPER_ENV_C5));
-    PyDict_SetItemString(d,"PAPER_ENV_C3", SWIG_FromInt((int)wxPAPER_ENV_C3));
-    PyDict_SetItemString(d,"PAPER_ENV_C4", SWIG_FromInt((int)wxPAPER_ENV_C4));
-    PyDict_SetItemString(d,"PAPER_ENV_C6", SWIG_FromInt((int)wxPAPER_ENV_C6));
-    PyDict_SetItemString(d,"PAPER_ENV_C65", SWIG_FromInt((int)wxPAPER_ENV_C65));
-    PyDict_SetItemString(d,"PAPER_ENV_B4", SWIG_FromInt((int)wxPAPER_ENV_B4));
-    PyDict_SetItemString(d,"PAPER_ENV_B5", SWIG_FromInt((int)wxPAPER_ENV_B5));
-    PyDict_SetItemString(d,"PAPER_ENV_B6", SWIG_FromInt((int)wxPAPER_ENV_B6));
-    PyDict_SetItemString(d,"PAPER_ENV_ITALY", SWIG_FromInt((int)wxPAPER_ENV_ITALY));
-    PyDict_SetItemString(d,"PAPER_ENV_MONARCH", SWIG_FromInt((int)wxPAPER_ENV_MONARCH));
-    PyDict_SetItemString(d,"PAPER_ENV_PERSONAL", SWIG_FromInt((int)wxPAPER_ENV_PERSONAL));
-    PyDict_SetItemString(d,"PAPER_FANFOLD_US", SWIG_FromInt((int)wxPAPER_FANFOLD_US));
-    PyDict_SetItemString(d,"PAPER_FANFOLD_STD_GERMAN", SWIG_FromInt((int)wxPAPER_FANFOLD_STD_GERMAN));
-    PyDict_SetItemString(d,"PAPER_FANFOLD_LGL_GERMAN", SWIG_FromInt((int)wxPAPER_FANFOLD_LGL_GERMAN));
-    PyDict_SetItemString(d,"PAPER_ISO_B4", SWIG_FromInt((int)wxPAPER_ISO_B4));
-    PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD", SWIG_FromInt((int)wxPAPER_JAPANESE_POSTCARD));
-    PyDict_SetItemString(d,"PAPER_9X11", SWIG_FromInt((int)wxPAPER_9X11));
-    PyDict_SetItemString(d,"PAPER_10X11", SWIG_FromInt((int)wxPAPER_10X11));
-    PyDict_SetItemString(d,"PAPER_15X11", SWIG_FromInt((int)wxPAPER_15X11));
-    PyDict_SetItemString(d,"PAPER_ENV_INVITE", SWIG_FromInt((int)wxPAPER_ENV_INVITE));
-    PyDict_SetItemString(d,"PAPER_LETTER_EXTRA", SWIG_FromInt((int)wxPAPER_LETTER_EXTRA));
-    PyDict_SetItemString(d,"PAPER_LEGAL_EXTRA", SWIG_FromInt((int)wxPAPER_LEGAL_EXTRA));
-    PyDict_SetItemString(d,"PAPER_TABLOID_EXTRA", SWIG_FromInt((int)wxPAPER_TABLOID_EXTRA));
-    PyDict_SetItemString(d,"PAPER_A4_EXTRA", SWIG_FromInt((int)wxPAPER_A4_EXTRA));
-    PyDict_SetItemString(d,"PAPER_LETTER_TRANSVERSE", SWIG_FromInt((int)wxPAPER_LETTER_TRANSVERSE));
-    PyDict_SetItemString(d,"PAPER_A4_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A4_TRANSVERSE));
-    PyDict_SetItemString(d,"PAPER_LETTER_EXTRA_TRANSVERSE", SWIG_FromInt((int)wxPAPER_LETTER_EXTRA_TRANSVERSE));
-    PyDict_SetItemString(d,"PAPER_A_PLUS", SWIG_FromInt((int)wxPAPER_A_PLUS));
-    PyDict_SetItemString(d,"PAPER_B_PLUS", SWIG_FromInt((int)wxPAPER_B_PLUS));
-    PyDict_SetItemString(d,"PAPER_LETTER_PLUS", SWIG_FromInt((int)wxPAPER_LETTER_PLUS));
-    PyDict_SetItemString(d,"PAPER_A4_PLUS", SWIG_FromInt((int)wxPAPER_A4_PLUS));
-    PyDict_SetItemString(d,"PAPER_A5_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A5_TRANSVERSE));
-    PyDict_SetItemString(d,"PAPER_B5_TRANSVERSE", SWIG_FromInt((int)wxPAPER_B5_TRANSVERSE));
-    PyDict_SetItemString(d,"PAPER_A3_EXTRA", SWIG_FromInt((int)wxPAPER_A3_EXTRA));
-    PyDict_SetItemString(d,"PAPER_A5_EXTRA", SWIG_FromInt((int)wxPAPER_A5_EXTRA));
-    PyDict_SetItemString(d,"PAPER_B5_EXTRA", SWIG_FromInt((int)wxPAPER_B5_EXTRA));
-    PyDict_SetItemString(d,"PAPER_A2", SWIG_FromInt((int)wxPAPER_A2));
-    PyDict_SetItemString(d,"PAPER_A3_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A3_TRANSVERSE));
-    PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_FromInt((int)wxPAPER_A3_EXTRA_TRANSVERSE));
-    PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_FromInt((int)wxDUPLEX_SIMPLEX));
-    PyDict_SetItemString(d,"DUPLEX_HORIZONTAL", SWIG_FromInt((int)wxDUPLEX_HORIZONTAL));
-    PyDict_SetItemString(d,"DUPLEX_VERTICAL", SWIG_FromInt((int)wxDUPLEX_VERTICAL));
-    PyDict_SetItemString(d,"ITEM_SEPARATOR", SWIG_FromInt((int)wxITEM_SEPARATOR));
-    PyDict_SetItemString(d,"ITEM_NORMAL", SWIG_FromInt((int)wxITEM_NORMAL));
-    PyDict_SetItemString(d,"ITEM_CHECK", SWIG_FromInt((int)wxITEM_CHECK));
-    PyDict_SetItemString(d,"ITEM_RADIO", SWIG_FromInt((int)wxITEM_RADIO));
-    PyDict_SetItemString(d,"ITEM_MAX", SWIG_FromInt((int)wxITEM_MAX));
-    PyDict_SetItemString(d,"HT_NOWHERE", SWIG_FromInt((int)wxHT_NOWHERE));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_FIRST", SWIG_FromInt((int)wxHT_SCROLLBAR_FIRST));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_1", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_1));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_2", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_LINE_2));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_1", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_1));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_2", SWIG_FromInt((int)wxHT_SCROLLBAR_ARROW_PAGE_2));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_THUMB", SWIG_FromInt((int)wxHT_SCROLLBAR_THUMB));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_1", SWIG_FromInt((int)wxHT_SCROLLBAR_BAR_1));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_2", SWIG_FromInt((int)wxHT_SCROLLBAR_BAR_2));
-    PyDict_SetItemString(d,"HT_SCROLLBAR_LAST", SWIG_FromInt((int)wxHT_SCROLLBAR_LAST));
-    PyDict_SetItemString(d,"HT_WINDOW_OUTSIDE", SWIG_FromInt((int)wxHT_WINDOW_OUTSIDE));
-    PyDict_SetItemString(d,"HT_WINDOW_INSIDE", SWIG_FromInt((int)wxHT_WINDOW_INSIDE));
-    PyDict_SetItemString(d,"HT_WINDOW_VERT_SCROLLBAR", SWIG_FromInt((int)wxHT_WINDOW_VERT_SCROLLBAR));
-    PyDict_SetItemString(d,"HT_WINDOW_HORZ_SCROLLBAR", SWIG_FromInt((int)wxHT_WINDOW_HORZ_SCROLLBAR));
-    PyDict_SetItemString(d,"HT_WINDOW_CORNER", SWIG_FromInt((int)wxHT_WINDOW_CORNER));
-    PyDict_SetItemString(d,"HT_MAX", SWIG_FromInt((int)wxHT_MAX));
-    PyDict_SetItemString(d,"MOD_NONE", SWIG_FromInt((int)wxMOD_NONE));
-    PyDict_SetItemString(d,"MOD_ALT", SWIG_FromInt((int)wxMOD_ALT));
-    PyDict_SetItemString(d,"MOD_CONTROL", SWIG_FromInt((int)wxMOD_CONTROL));
-    PyDict_SetItemString(d,"MOD_SHIFT", SWIG_FromInt((int)wxMOD_SHIFT));
-    PyDict_SetItemString(d,"MOD_WIN", SWIG_FromInt((int)wxMOD_WIN));
-    PyDict_SetItemString(d,"UPDATE_UI_NONE", SWIG_FromInt((int)wxUPDATE_UI_NONE));
-    PyDict_SetItemString(d,"UPDATE_UI_RECURSE", SWIG_FromInt((int)wxUPDATE_UI_RECURSE));
-    PyDict_SetItemString(d,"UPDATE_UI_FROMIDLE", SWIG_FromInt((int)wxUPDATE_UI_FROMIDLE));
+    PyDict_SetItemString(d,"NOT_FOUND", SWIG_From_int((int)wxNOT_FOUND));
+    PyDict_SetItemString(d,"VSCROLL", SWIG_From_int((int)wxVSCROLL));
+    PyDict_SetItemString(d,"HSCROLL", SWIG_From_int((int)wxHSCROLL));
+    PyDict_SetItemString(d,"CAPTION", SWIG_From_int((int)wxCAPTION));
+    PyDict_SetItemString(d,"DOUBLE_BORDER", SWIG_From_int((int)wxDOUBLE_BORDER));
+    PyDict_SetItemString(d,"SUNKEN_BORDER", SWIG_From_int((int)wxSUNKEN_BORDER));
+    PyDict_SetItemString(d,"RAISED_BORDER", SWIG_From_int((int)wxRAISED_BORDER));
+    PyDict_SetItemString(d,"BORDER", SWIG_From_int((int)wxBORDER));
+    PyDict_SetItemString(d,"SIMPLE_BORDER", SWIG_From_int((int)wxSIMPLE_BORDER));
+    PyDict_SetItemString(d,"STATIC_BORDER", SWIG_From_int((int)wxSTATIC_BORDER));
+    PyDict_SetItemString(d,"TRANSPARENT_WINDOW", SWIG_From_int((int)wxTRANSPARENT_WINDOW));
+    PyDict_SetItemString(d,"NO_BORDER", SWIG_From_int((int)wxNO_BORDER));
+    PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_From_int((int)wxTAB_TRAVERSAL));
+    PyDict_SetItemString(d,"WANTS_CHARS", SWIG_From_int((int)wxWANTS_CHARS));
+    PyDict_SetItemString(d,"POPUP_WINDOW", SWIG_From_int((int)wxPOPUP_WINDOW));
+    PyDict_SetItemString(d,"CENTER_FRAME", SWIG_From_int((int)wxCENTER_FRAME));
+    PyDict_SetItemString(d,"CENTRE_ON_SCREEN", SWIG_From_int((int)wxCENTRE_ON_SCREEN));
+    PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_From_int((int)wxCENTER_ON_SCREEN));
+    PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_From_int((int)wxED_CLIENT_MARGIN));
+    PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_From_int((int)wxED_BUTTONS_BOTTOM));
+    PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_From_int((int)wxED_BUTTONS_RIGHT));
+    PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_From_int((int)wxED_STATIC_LINE));
+    PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_From_int((int)wxEXT_DIALOG_STYLE));
+    PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_From_int((int)wxCLIP_CHILDREN));
+    PyDict_SetItemString(d,"CLIP_SIBLINGS", SWIG_From_int((int)wxCLIP_SIBLINGS));
+    PyDict_SetItemString(d,"ALWAYS_SHOW_SB", SWIG_From_int((int)wxALWAYS_SHOW_SB));
+    PyDict_SetItemString(d,"RETAINED", SWIG_From_int((int)wxRETAINED));
+    PyDict_SetItemString(d,"BACKINGSTORE", SWIG_From_int((int)wxBACKINGSTORE));
+    PyDict_SetItemString(d,"COLOURED", SWIG_From_int((int)wxCOLOURED));
+    PyDict_SetItemString(d,"FIXED_LENGTH", SWIG_From_int((int)wxFIXED_LENGTH));
+    PyDict_SetItemString(d,"LB_NEEDED_SB", SWIG_From_int((int)wxLB_NEEDED_SB));
+    PyDict_SetItemString(d,"LB_ALWAYS_SB", SWIG_From_int((int)wxLB_ALWAYS_SB));
+    PyDict_SetItemString(d,"LB_SORT", SWIG_From_int((int)wxLB_SORT));
+    PyDict_SetItemString(d,"LB_SINGLE", SWIG_From_int((int)wxLB_SINGLE));
+    PyDict_SetItemString(d,"LB_MULTIPLE", SWIG_From_int((int)wxLB_MULTIPLE));
+    PyDict_SetItemString(d,"LB_EXTENDED", SWIG_From_int((int)wxLB_EXTENDED));
+    PyDict_SetItemString(d,"LB_OWNERDRAW", SWIG_From_int((int)wxLB_OWNERDRAW));
+    PyDict_SetItemString(d,"LB_HSCROLL", SWIG_From_int((int)wxLB_HSCROLL));
+    PyDict_SetItemString(d,"PROCESS_ENTER", SWIG_From_int((int)wxPROCESS_ENTER));
+    PyDict_SetItemString(d,"PASSWORD", SWIG_From_int((int)wxPASSWORD));
+    PyDict_SetItemString(d,"CB_SIMPLE", SWIG_From_int((int)wxCB_SIMPLE));
+    PyDict_SetItemString(d,"CB_DROPDOWN", SWIG_From_int((int)wxCB_DROPDOWN));
+    PyDict_SetItemString(d,"CB_SORT", SWIG_From_int((int)wxCB_SORT));
+    PyDict_SetItemString(d,"CB_READONLY", SWIG_From_int((int)wxCB_READONLY));
+    PyDict_SetItemString(d,"RA_HORIZONTAL", SWIG_From_int((int)wxRA_HORIZONTAL));
+    PyDict_SetItemString(d,"RA_VERTICAL", SWIG_From_int((int)wxRA_VERTICAL));
+    PyDict_SetItemString(d,"RA_SPECIFY_ROWS", SWIG_From_int((int)wxRA_SPECIFY_ROWS));
+    PyDict_SetItemString(d,"RA_SPECIFY_COLS", SWIG_From_int((int)wxRA_SPECIFY_COLS));
+    PyDict_SetItemString(d,"RB_GROUP", SWIG_From_int((int)wxRB_GROUP));
+    PyDict_SetItemString(d,"RB_SINGLE", SWIG_From_int((int)wxRB_SINGLE));
+    PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_From_int((int)wxSL_HORIZONTAL));
+    PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)wxSL_VERTICAL));
+    PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)wxSL_AUTOTICKS));
+    PyDict_SetItemString(d,"SL_LABELS", SWIG_From_int((int)wxSL_LABELS));
+    PyDict_SetItemString(d,"SL_LEFT", SWIG_From_int((int)wxSL_LEFT));
+    PyDict_SetItemString(d,"SL_TOP", SWIG_From_int((int)wxSL_TOP));
+    PyDict_SetItemString(d,"SL_RIGHT", SWIG_From_int((int)wxSL_RIGHT));
+    PyDict_SetItemString(d,"SL_BOTTOM", SWIG_From_int((int)wxSL_BOTTOM));
+    PyDict_SetItemString(d,"SL_BOTH", SWIG_From_int((int)wxSL_BOTH));
+    PyDict_SetItemString(d,"SL_SELRANGE", SWIG_From_int((int)wxSL_SELRANGE));
+    PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_From_int((int)wxSB_HORIZONTAL));
+    PyDict_SetItemString(d,"SB_VERTICAL", SWIG_From_int((int)wxSB_VERTICAL));
+    PyDict_SetItemString(d,"ST_SIZEGRIP", SWIG_From_int((int)wxST_SIZEGRIP));
+    PyDict_SetItemString(d,"ST_NO_AUTORESIZE", SWIG_From_int((int)wxST_NO_AUTORESIZE));
+    PyDict_SetItemString(d,"FLOOD_SURFACE", SWIG_From_int((int)wxFLOOD_SURFACE));
+    PyDict_SetItemString(d,"FLOOD_BORDER", SWIG_From_int((int)wxFLOOD_BORDER));
+    PyDict_SetItemString(d,"ODDEVEN_RULE", SWIG_From_int((int)wxODDEVEN_RULE));
+    PyDict_SetItemString(d,"WINDING_RULE", SWIG_From_int((int)wxWINDING_RULE));
+    PyDict_SetItemString(d,"TOOL_TOP", SWIG_From_int((int)wxTOOL_TOP));
+    PyDict_SetItemString(d,"TOOL_BOTTOM", SWIG_From_int((int)wxTOOL_BOTTOM));
+    PyDict_SetItemString(d,"TOOL_LEFT", SWIG_From_int((int)wxTOOL_LEFT));
+    PyDict_SetItemString(d,"TOOL_RIGHT", SWIG_From_int((int)wxTOOL_RIGHT));
+    PyDict_SetItemString(d,"OK", SWIG_From_int((int)wxOK));
+    PyDict_SetItemString(d,"YES_NO", SWIG_From_int((int)wxYES_NO));
+    PyDict_SetItemString(d,"CANCEL", SWIG_From_int((int)wxCANCEL));
+    PyDict_SetItemString(d,"YES", SWIG_From_int((int)wxYES));
+    PyDict_SetItemString(d,"NO", SWIG_From_int((int)wxNO));
+    PyDict_SetItemString(d,"NO_DEFAULT", SWIG_From_int((int)wxNO_DEFAULT));
+    PyDict_SetItemString(d,"YES_DEFAULT", SWIG_From_int((int)wxYES_DEFAULT));
+    PyDict_SetItemString(d,"ICON_EXCLAMATION", SWIG_From_int((int)wxICON_EXCLAMATION));
+    PyDict_SetItemString(d,"ICON_HAND", SWIG_From_int((int)wxICON_HAND));
+    PyDict_SetItemString(d,"ICON_QUESTION", SWIG_From_int((int)wxICON_QUESTION));
+    PyDict_SetItemString(d,"ICON_INFORMATION", SWIG_From_int((int)wxICON_INFORMATION));
+    PyDict_SetItemString(d,"ICON_STOP", SWIG_From_int((int)wxICON_STOP));
+    PyDict_SetItemString(d,"ICON_ASTERISK", SWIG_From_int((int)wxICON_ASTERISK));
+    PyDict_SetItemString(d,"ICON_MASK", SWIG_From_int((int)wxICON_MASK));
+    PyDict_SetItemString(d,"ICON_WARNING", SWIG_From_int((int)wxICON_WARNING));
+    PyDict_SetItemString(d,"ICON_ERROR", SWIG_From_int((int)wxICON_ERROR));
+    PyDict_SetItemString(d,"FORWARD", SWIG_From_int((int)wxFORWARD));
+    PyDict_SetItemString(d,"BACKWARD", SWIG_From_int((int)wxBACKWARD));
+    PyDict_SetItemString(d,"RESET", SWIG_From_int((int)wxRESET));
+    PyDict_SetItemString(d,"HELP", SWIG_From_int((int)wxHELP));
+    PyDict_SetItemString(d,"MORE", SWIG_From_int((int)wxMORE));
+    PyDict_SetItemString(d,"SETUP", SWIG_From_int((int)wxSETUP));
+    PyDict_SetItemString(d,"SIZE_AUTO_WIDTH", SWIG_From_int((int)wxSIZE_AUTO_WIDTH));
+    PyDict_SetItemString(d,"SIZE_AUTO_HEIGHT", SWIG_From_int((int)wxSIZE_AUTO_HEIGHT));
+    PyDict_SetItemString(d,"SIZE_AUTO", SWIG_From_int((int)wxSIZE_AUTO));
+    PyDict_SetItemString(d,"SIZE_USE_EXISTING", SWIG_From_int((int)wxSIZE_USE_EXISTING));
+    PyDict_SetItemString(d,"SIZE_ALLOW_MINUS_ONE", SWIG_From_int((int)wxSIZE_ALLOW_MINUS_ONE));
+    PyDict_SetItemString(d,"PORTRAIT", SWIG_From_int((int)wxPORTRAIT));
+    PyDict_SetItemString(d,"LANDSCAPE", SWIG_From_int((int)wxLANDSCAPE));
+    PyDict_SetItemString(d,"PRINT_QUALITY_HIGH", SWIG_From_int((int)wxPRINT_QUALITY_HIGH));
+    PyDict_SetItemString(d,"PRINT_QUALITY_MEDIUM", SWIG_From_int((int)wxPRINT_QUALITY_MEDIUM));
+    PyDict_SetItemString(d,"PRINT_QUALITY_LOW", SWIG_From_int((int)wxPRINT_QUALITY_LOW));
+    PyDict_SetItemString(d,"PRINT_QUALITY_DRAFT", SWIG_From_int((int)wxPRINT_QUALITY_DRAFT));
+    PyDict_SetItemString(d,"ID_ANY", SWIG_From_int((int)wxID_ANY));
+    PyDict_SetItemString(d,"ID_SEPARATOR", SWIG_From_int((int)wxID_SEPARATOR));
+    PyDict_SetItemString(d,"ID_LOWEST", SWIG_From_int((int)wxID_LOWEST));
+    PyDict_SetItemString(d,"ID_OPEN", SWIG_From_int((int)wxID_OPEN));
+    PyDict_SetItemString(d,"ID_CLOSE", SWIG_From_int((int)wxID_CLOSE));
+    PyDict_SetItemString(d,"ID_NEW", SWIG_From_int((int)wxID_NEW));
+    PyDict_SetItemString(d,"ID_SAVE", SWIG_From_int((int)wxID_SAVE));
+    PyDict_SetItemString(d,"ID_SAVEAS", SWIG_From_int((int)wxID_SAVEAS));
+    PyDict_SetItemString(d,"ID_REVERT", SWIG_From_int((int)wxID_REVERT));
+    PyDict_SetItemString(d,"ID_EXIT", SWIG_From_int((int)wxID_EXIT));
+    PyDict_SetItemString(d,"ID_UNDO", SWIG_From_int((int)wxID_UNDO));
+    PyDict_SetItemString(d,"ID_REDO", SWIG_From_int((int)wxID_REDO));
+    PyDict_SetItemString(d,"ID_HELP", SWIG_From_int((int)wxID_HELP));
+    PyDict_SetItemString(d,"ID_PRINT", SWIG_From_int((int)wxID_PRINT));
+    PyDict_SetItemString(d,"ID_PRINT_SETUP", SWIG_From_int((int)wxID_PRINT_SETUP));
+    PyDict_SetItemString(d,"ID_PREVIEW", SWIG_From_int((int)wxID_PREVIEW));
+    PyDict_SetItemString(d,"ID_ABOUT", SWIG_From_int((int)wxID_ABOUT));
+    PyDict_SetItemString(d,"ID_HELP_CONTENTS", SWIG_From_int((int)wxID_HELP_CONTENTS));
+    PyDict_SetItemString(d,"ID_HELP_COMMANDS", SWIG_From_int((int)wxID_HELP_COMMANDS));
+    PyDict_SetItemString(d,"ID_HELP_PROCEDURES", SWIG_From_int((int)wxID_HELP_PROCEDURES));
+    PyDict_SetItemString(d,"ID_HELP_CONTEXT", SWIG_From_int((int)wxID_HELP_CONTEXT));
+    PyDict_SetItemString(d,"ID_CLOSE_ALL", SWIG_From_int((int)wxID_CLOSE_ALL));
+    PyDict_SetItemString(d,"ID_PREFERENCES", SWIG_From_int((int)wxID_PREFERENCES));
+    PyDict_SetItemString(d,"ID_CUT", SWIG_From_int((int)wxID_CUT));
+    PyDict_SetItemString(d,"ID_COPY", SWIG_From_int((int)wxID_COPY));
+    PyDict_SetItemString(d,"ID_PASTE", SWIG_From_int((int)wxID_PASTE));
+    PyDict_SetItemString(d,"ID_CLEAR", SWIG_From_int((int)wxID_CLEAR));
+    PyDict_SetItemString(d,"ID_FIND", SWIG_From_int((int)wxID_FIND));
+    PyDict_SetItemString(d,"ID_DUPLICATE", SWIG_From_int((int)wxID_DUPLICATE));
+    PyDict_SetItemString(d,"ID_SELECTALL", SWIG_From_int((int)wxID_SELECTALL));
+    PyDict_SetItemString(d,"ID_DELETE", SWIG_From_int((int)wxID_DELETE));
+    PyDict_SetItemString(d,"ID_REPLACE", SWIG_From_int((int)wxID_REPLACE));
+    PyDict_SetItemString(d,"ID_REPLACE_ALL", SWIG_From_int((int)wxID_REPLACE_ALL));
+    PyDict_SetItemString(d,"ID_PROPERTIES", SWIG_From_int((int)wxID_PROPERTIES));
+    PyDict_SetItemString(d,"ID_VIEW_DETAILS", SWIG_From_int((int)wxID_VIEW_DETAILS));
+    PyDict_SetItemString(d,"ID_VIEW_LARGEICONS", SWIG_From_int((int)wxID_VIEW_LARGEICONS));
+    PyDict_SetItemString(d,"ID_VIEW_SMALLICONS", SWIG_From_int((int)wxID_VIEW_SMALLICONS));
+    PyDict_SetItemString(d,"ID_VIEW_LIST", SWIG_From_int((int)wxID_VIEW_LIST));
+    PyDict_SetItemString(d,"ID_VIEW_SORTDATE", SWIG_From_int((int)wxID_VIEW_SORTDATE));
+    PyDict_SetItemString(d,"ID_VIEW_SORTNAME", SWIG_From_int((int)wxID_VIEW_SORTNAME));
+    PyDict_SetItemString(d,"ID_VIEW_SORTSIZE", SWIG_From_int((int)wxID_VIEW_SORTSIZE));
+    PyDict_SetItemString(d,"ID_VIEW_SORTTYPE", SWIG_From_int((int)wxID_VIEW_SORTTYPE));
+    PyDict_SetItemString(d,"ID_FILE1", SWIG_From_int((int)wxID_FILE1));
+    PyDict_SetItemString(d,"ID_FILE2", SWIG_From_int((int)wxID_FILE2));
+    PyDict_SetItemString(d,"ID_FILE3", SWIG_From_int((int)wxID_FILE3));
+    PyDict_SetItemString(d,"ID_FILE4", SWIG_From_int((int)wxID_FILE4));
+    PyDict_SetItemString(d,"ID_FILE5", SWIG_From_int((int)wxID_FILE5));
+    PyDict_SetItemString(d,"ID_FILE6", SWIG_From_int((int)wxID_FILE6));
+    PyDict_SetItemString(d,"ID_FILE7", SWIG_From_int((int)wxID_FILE7));
+    PyDict_SetItemString(d,"ID_FILE8", SWIG_From_int((int)wxID_FILE8));
+    PyDict_SetItemString(d,"ID_FILE9", SWIG_From_int((int)wxID_FILE9));
+    PyDict_SetItemString(d,"ID_OK", SWIG_From_int((int)wxID_OK));
+    PyDict_SetItemString(d,"ID_CANCEL", SWIG_From_int((int)wxID_CANCEL));
+    PyDict_SetItemString(d,"ID_APPLY", SWIG_From_int((int)wxID_APPLY));
+    PyDict_SetItemString(d,"ID_YES", SWIG_From_int((int)wxID_YES));
+    PyDict_SetItemString(d,"ID_NO", SWIG_From_int((int)wxID_NO));
+    PyDict_SetItemString(d,"ID_STATIC", SWIG_From_int((int)wxID_STATIC));
+    PyDict_SetItemString(d,"ID_FORWARD", SWIG_From_int((int)wxID_FORWARD));
+    PyDict_SetItemString(d,"ID_BACKWARD", SWIG_From_int((int)wxID_BACKWARD));
+    PyDict_SetItemString(d,"ID_DEFAULT", SWIG_From_int((int)wxID_DEFAULT));
+    PyDict_SetItemString(d,"ID_MORE", SWIG_From_int((int)wxID_MORE));
+    PyDict_SetItemString(d,"ID_SETUP", SWIG_From_int((int)wxID_SETUP));
+    PyDict_SetItemString(d,"ID_RESET", SWIG_From_int((int)wxID_RESET));
+    PyDict_SetItemString(d,"ID_CONTEXT_HELP", SWIG_From_int((int)wxID_CONTEXT_HELP));
+    PyDict_SetItemString(d,"ID_YESTOALL", SWIG_From_int((int)wxID_YESTOALL));
+    PyDict_SetItemString(d,"ID_NOTOALL", SWIG_From_int((int)wxID_NOTOALL));
+    PyDict_SetItemString(d,"ID_ABORT", SWIG_From_int((int)wxID_ABORT));
+    PyDict_SetItemString(d,"ID_RETRY", SWIG_From_int((int)wxID_RETRY));
+    PyDict_SetItemString(d,"ID_IGNORE", SWIG_From_int((int)wxID_IGNORE));
+    PyDict_SetItemString(d,"ID_ADD", SWIG_From_int((int)wxID_ADD));
+    PyDict_SetItemString(d,"ID_REMOVE", SWIG_From_int((int)wxID_REMOVE));
+    PyDict_SetItemString(d,"ID_UP", SWIG_From_int((int)wxID_UP));
+    PyDict_SetItemString(d,"ID_DOWN", SWIG_From_int((int)wxID_DOWN));
+    PyDict_SetItemString(d,"ID_HOME", SWIG_From_int((int)wxID_HOME));
+    PyDict_SetItemString(d,"ID_REFRESH", SWIG_From_int((int)wxID_REFRESH));
+    PyDict_SetItemString(d,"ID_STOP", SWIG_From_int((int)wxID_STOP));
+    PyDict_SetItemString(d,"ID_INDEX", SWIG_From_int((int)wxID_INDEX));
+    PyDict_SetItemString(d,"ID_BOLD", SWIG_From_int((int)wxID_BOLD));
+    PyDict_SetItemString(d,"ID_ITALIC", SWIG_From_int((int)wxID_ITALIC));
+    PyDict_SetItemString(d,"ID_JUSTIFY_CENTER", SWIG_From_int((int)wxID_JUSTIFY_CENTER));
+    PyDict_SetItemString(d,"ID_JUSTIFY_FILL", SWIG_From_int((int)wxID_JUSTIFY_FILL));
+    PyDict_SetItemString(d,"ID_JUSTIFY_RIGHT", SWIG_From_int((int)wxID_JUSTIFY_RIGHT));
+    PyDict_SetItemString(d,"ID_JUSTIFY_LEFT", SWIG_From_int((int)wxID_JUSTIFY_LEFT));
+    PyDict_SetItemString(d,"ID_UNDERLINE", SWIG_From_int((int)wxID_UNDERLINE));
+    PyDict_SetItemString(d,"ID_INDENT", SWIG_From_int((int)wxID_INDENT));
+    PyDict_SetItemString(d,"ID_UNINDENT", SWIG_From_int((int)wxID_UNINDENT));
+    PyDict_SetItemString(d,"ID_ZOOM_100", SWIG_From_int((int)wxID_ZOOM_100));
+    PyDict_SetItemString(d,"ID_ZOOM_FIT", SWIG_From_int((int)wxID_ZOOM_FIT));
+    PyDict_SetItemString(d,"ID_ZOOM_IN", SWIG_From_int((int)wxID_ZOOM_IN));
+    PyDict_SetItemString(d,"ID_ZOOM_OUT", SWIG_From_int((int)wxID_ZOOM_OUT));
+    PyDict_SetItemString(d,"ID_UNDELETE", SWIG_From_int((int)wxID_UNDELETE));
+    PyDict_SetItemString(d,"ID_REVERT_TO_SAVED", SWIG_From_int((int)wxID_REVERT_TO_SAVED));
+    PyDict_SetItemString(d,"ID_HIGHEST", SWIG_From_int((int)wxID_HIGHEST));
+    PyDict_SetItemString(d,"OPEN", SWIG_From_int((int)wxOPEN));
+    PyDict_SetItemString(d,"SAVE", SWIG_From_int((int)wxSAVE));
+    PyDict_SetItemString(d,"HIDE_READONLY", SWIG_From_int((int)wxHIDE_READONLY));
+    PyDict_SetItemString(d,"OVERWRITE_PROMPT", SWIG_From_int((int)wxOVERWRITE_PROMPT));
+    PyDict_SetItemString(d,"FILE_MUST_EXIST", SWIG_From_int((int)wxFILE_MUST_EXIST));
+    PyDict_SetItemString(d,"MULTIPLE", SWIG_From_int((int)wxMULTIPLE));
+    PyDict_SetItemString(d,"CHANGE_DIR", SWIG_From_int((int)wxCHANGE_DIR));
+    PyDict_SetItemString(d,"ACCEL_ALT", SWIG_From_int((int)wxACCEL_ALT));
+    PyDict_SetItemString(d,"ACCEL_CTRL", SWIG_From_int((int)wxACCEL_CTRL));
+    PyDict_SetItemString(d,"ACCEL_SHIFT", SWIG_From_int((int)wxACCEL_SHIFT));
+    PyDict_SetItemString(d,"ACCEL_NORMAL", SWIG_From_int((int)wxACCEL_NORMAL));
+    PyDict_SetItemString(d,"PD_AUTO_HIDE", SWIG_From_int((int)wxPD_AUTO_HIDE));
+    PyDict_SetItemString(d,"PD_APP_MODAL", SWIG_From_int((int)wxPD_APP_MODAL));
+    PyDict_SetItemString(d,"PD_CAN_ABORT", SWIG_From_int((int)wxPD_CAN_ABORT));
+    PyDict_SetItemString(d,"PD_ELAPSED_TIME", SWIG_From_int((int)wxPD_ELAPSED_TIME));
+    PyDict_SetItemString(d,"PD_ESTIMATED_TIME", SWIG_From_int((int)wxPD_ESTIMATED_TIME));
+    PyDict_SetItemString(d,"PD_REMAINING_TIME", SWIG_From_int((int)wxPD_REMAINING_TIME));
+    PyDict_SetItemString(d,"DD_NEW_DIR_BUTTON", SWIG_From_int((int)wxDD_NEW_DIR_BUTTON));
+    PyDict_SetItemString(d,"DD_DEFAULT_STYLE", SWIG_From_int((int)wxDD_DEFAULT_STYLE));
+    PyDict_SetItemString(d,"MENU_TEAROFF", SWIG_From_int((int)wxMENU_TEAROFF));
+    PyDict_SetItemString(d,"MB_DOCKABLE", SWIG_From_int((int)wxMB_DOCKABLE));
+    PyDict_SetItemString(d,"NO_FULL_REPAINT_ON_RESIZE", SWIG_From_int((int)wxNO_FULL_REPAINT_ON_RESIZE));
+    PyDict_SetItemString(d,"FULL_REPAINT_ON_RESIZE", SWIG_From_int((int)wxFULL_REPAINT_ON_RESIZE));
+    PyDict_SetItemString(d,"LI_HORIZONTAL", SWIG_From_int((int)wxLI_HORIZONTAL));
+    PyDict_SetItemString(d,"LI_VERTICAL", SWIG_From_int((int)wxLI_VERTICAL));
+    PyDict_SetItemString(d,"WS_EX_VALIDATE_RECURSIVELY", SWIG_From_int((int)wxWS_EX_VALIDATE_RECURSIVELY));
+    PyDict_SetItemString(d,"WS_EX_BLOCK_EVENTS", SWIG_From_int((int)wxWS_EX_BLOCK_EVENTS));
+    PyDict_SetItemString(d,"WS_EX_TRANSIENT", SWIG_From_int((int)wxWS_EX_TRANSIENT));
+    PyDict_SetItemString(d,"WS_EX_THEMED_BACKGROUND", SWIG_From_int((int)wxWS_EX_THEMED_BACKGROUND));
+    PyDict_SetItemString(d,"WS_EX_PROCESS_IDLE", SWIG_From_int((int)wxWS_EX_PROCESS_IDLE));
+    PyDict_SetItemString(d,"WS_EX_PROCESS_UI_UPDATES", SWIG_From_int((int)wxWS_EX_PROCESS_UI_UPDATES));
+    PyDict_SetItemString(d,"MM_TEXT", SWIG_From_int((int)wxMM_TEXT));
+    PyDict_SetItemString(d,"MM_LOMETRIC", SWIG_From_int((int)wxMM_LOMETRIC));
+    PyDict_SetItemString(d,"MM_HIMETRIC", SWIG_From_int((int)wxMM_HIMETRIC));
+    PyDict_SetItemString(d,"MM_LOENGLISH", SWIG_From_int((int)wxMM_LOENGLISH));
+    PyDict_SetItemString(d,"MM_HIENGLISH", SWIG_From_int((int)wxMM_HIENGLISH));
+    PyDict_SetItemString(d,"MM_TWIPS", SWIG_From_int((int)wxMM_TWIPS));
+    PyDict_SetItemString(d,"MM_ISOTROPIC", SWIG_From_int((int)wxMM_ISOTROPIC));
+    PyDict_SetItemString(d,"MM_ANISOTROPIC", SWIG_From_int((int)wxMM_ANISOTROPIC));
+    PyDict_SetItemString(d,"MM_POINTS", SWIG_From_int((int)wxMM_POINTS));
+    PyDict_SetItemString(d,"MM_METRIC", SWIG_From_int((int)wxMM_METRIC));
+    PyDict_SetItemString(d,"CENTRE", SWIG_From_int((int)wxCENTRE));
+    PyDict_SetItemString(d,"CENTER", SWIG_From_int((int)wxCENTER));
+    PyDict_SetItemString(d,"HORIZONTAL", SWIG_From_int((int)wxHORIZONTAL));
+    PyDict_SetItemString(d,"VERTICAL", SWIG_From_int((int)wxVERTICAL));
+    PyDict_SetItemString(d,"BOTH", SWIG_From_int((int)wxBOTH));
+    PyDict_SetItemString(d,"LEFT", SWIG_From_int((int)wxLEFT));
+    PyDict_SetItemString(d,"RIGHT", SWIG_From_int((int)wxRIGHT));
+    PyDict_SetItemString(d,"UP", SWIG_From_int((int)wxUP));
+    PyDict_SetItemString(d,"DOWN", SWIG_From_int((int)wxDOWN));
+    PyDict_SetItemString(d,"TOP", SWIG_From_int((int)wxTOP));
+    PyDict_SetItemString(d,"BOTTOM", SWIG_From_int((int)wxBOTTOM));
+    PyDict_SetItemString(d,"NORTH", SWIG_From_int((int)wxNORTH));
+    PyDict_SetItemString(d,"SOUTH", SWIG_From_int((int)wxSOUTH));
+    PyDict_SetItemString(d,"WEST", SWIG_From_int((int)wxWEST));
+    PyDict_SetItemString(d,"EAST", SWIG_From_int((int)wxEAST));
+    PyDict_SetItemString(d,"ALL", SWIG_From_int((int)wxALL));
+    PyDict_SetItemString(d,"ALIGN_NOT", SWIG_From_int((int)wxALIGN_NOT));
+    PyDict_SetItemString(d,"ALIGN_CENTER_HORIZONTAL", SWIG_From_int((int)wxALIGN_CENTER_HORIZONTAL));
+    PyDict_SetItemString(d,"ALIGN_CENTRE_HORIZONTAL", SWIG_From_int((int)wxALIGN_CENTRE_HORIZONTAL));
+    PyDict_SetItemString(d,"ALIGN_LEFT", SWIG_From_int((int)wxALIGN_LEFT));
+    PyDict_SetItemString(d,"ALIGN_TOP", SWIG_From_int((int)wxALIGN_TOP));
+    PyDict_SetItemString(d,"ALIGN_RIGHT", SWIG_From_int((int)wxALIGN_RIGHT));
+    PyDict_SetItemString(d,"ALIGN_BOTTOM", SWIG_From_int((int)wxALIGN_BOTTOM));
+    PyDict_SetItemString(d,"ALIGN_CENTER_VERTICAL", SWIG_From_int((int)wxALIGN_CENTER_VERTICAL));
+    PyDict_SetItemString(d,"ALIGN_CENTRE_VERTICAL", SWIG_From_int((int)wxALIGN_CENTRE_VERTICAL));
+    PyDict_SetItemString(d,"ALIGN_CENTER", SWIG_From_int((int)wxALIGN_CENTER));
+    PyDict_SetItemString(d,"ALIGN_CENTRE", SWIG_From_int((int)wxALIGN_CENTRE));
+    PyDict_SetItemString(d,"ALIGN_MASK", SWIG_From_int((int)wxALIGN_MASK));
+    PyDict_SetItemString(d,"STRETCH_NOT", SWIG_From_int((int)wxSTRETCH_NOT));
+    PyDict_SetItemString(d,"SHRINK", SWIG_From_int((int)wxSHRINK));
+    PyDict_SetItemString(d,"GROW", SWIG_From_int((int)wxGROW));
+    PyDict_SetItemString(d,"EXPAND", SWIG_From_int((int)wxEXPAND));
+    PyDict_SetItemString(d,"SHAPED", SWIG_From_int((int)wxSHAPED));
+    PyDict_SetItemString(d,"FIXED_MINSIZE", SWIG_From_int((int)wxFIXED_MINSIZE));
+    PyDict_SetItemString(d,"TILE", SWIG_From_int((int)wxTILE));
+    PyDict_SetItemString(d,"ADJUST_MINSIZE", SWIG_From_int((int)wxADJUST_MINSIZE));
+    PyDict_SetItemString(d,"BORDER_DEFAULT", SWIG_From_int((int)wxBORDER_DEFAULT));
+    PyDict_SetItemString(d,"BORDER_NONE", SWIG_From_int((int)wxBORDER_NONE));
+    PyDict_SetItemString(d,"BORDER_STATIC", SWIG_From_int((int)wxBORDER_STATIC));
+    PyDict_SetItemString(d,"BORDER_SIMPLE", SWIG_From_int((int)wxBORDER_SIMPLE));
+    PyDict_SetItemString(d,"BORDER_RAISED", SWIG_From_int((int)wxBORDER_RAISED));
+    PyDict_SetItemString(d,"BORDER_SUNKEN", SWIG_From_int((int)wxBORDER_SUNKEN));
+    PyDict_SetItemString(d,"BORDER_DOUBLE", SWIG_From_int((int)wxBORDER_DOUBLE));
+    PyDict_SetItemString(d,"BORDER_MASK", SWIG_From_int((int)wxBORDER_MASK));
+    PyDict_SetItemString(d,"BG_STYLE_SYSTEM", SWIG_From_int((int)wxBG_STYLE_SYSTEM));
+    PyDict_SetItemString(d,"BG_STYLE_COLOUR", SWIG_From_int((int)wxBG_STYLE_COLOUR));
+    PyDict_SetItemString(d,"BG_STYLE_CUSTOM", SWIG_From_int((int)wxBG_STYLE_CUSTOM));
+    PyDict_SetItemString(d,"DEFAULT", SWIG_From_int((int)wxDEFAULT));
+    PyDict_SetItemString(d,"DECORATIVE", SWIG_From_int((int)wxDECORATIVE));
+    PyDict_SetItemString(d,"ROMAN", SWIG_From_int((int)wxROMAN));
+    PyDict_SetItemString(d,"SCRIPT", SWIG_From_int((int)wxSCRIPT));
+    PyDict_SetItemString(d,"SWISS", SWIG_From_int((int)wxSWISS));
+    PyDict_SetItemString(d,"MODERN", SWIG_From_int((int)wxMODERN));
+    PyDict_SetItemString(d,"TELETYPE", SWIG_From_int((int)wxTELETYPE));
+    PyDict_SetItemString(d,"VARIABLE", SWIG_From_int((int)wxVARIABLE));
+    PyDict_SetItemString(d,"FIXED", SWIG_From_int((int)wxFIXED));
+    PyDict_SetItemString(d,"NORMAL", SWIG_From_int((int)wxNORMAL));
+    PyDict_SetItemString(d,"LIGHT", SWIG_From_int((int)wxLIGHT));
+    PyDict_SetItemString(d,"BOLD", SWIG_From_int((int)wxBOLD));
+    PyDict_SetItemString(d,"ITALIC", SWIG_From_int((int)wxITALIC));
+    PyDict_SetItemString(d,"SLANT", SWIG_From_int((int)wxSLANT));
+    PyDict_SetItemString(d,"SOLID", SWIG_From_int((int)wxSOLID));
+    PyDict_SetItemString(d,"DOT", SWIG_From_int((int)wxDOT));
+    PyDict_SetItemString(d,"LONG_DASH", SWIG_From_int((int)wxLONG_DASH));
+    PyDict_SetItemString(d,"SHORT_DASH", SWIG_From_int((int)wxSHORT_DASH));
+    PyDict_SetItemString(d,"DOT_DASH", SWIG_From_int((int)wxDOT_DASH));
+    PyDict_SetItemString(d,"USER_DASH", SWIG_From_int((int)wxUSER_DASH));
+    PyDict_SetItemString(d,"TRANSPARENT", SWIG_From_int((int)wxTRANSPARENT));
+    PyDict_SetItemString(d,"STIPPLE", SWIG_From_int((int)wxSTIPPLE));
+    PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_From_int((int)wxBDIAGONAL_HATCH));
+    PyDict_SetItemString(d,"CROSSDIAG_HATCH", SWIG_From_int((int)wxCROSSDIAG_HATCH));
+    PyDict_SetItemString(d,"FDIAGONAL_HATCH", SWIG_From_int((int)wxFDIAGONAL_HATCH));
+    PyDict_SetItemString(d,"CROSS_HATCH", SWIG_From_int((int)wxCROSS_HATCH));
+    PyDict_SetItemString(d,"HORIZONTAL_HATCH", SWIG_From_int((int)wxHORIZONTAL_HATCH));
+    PyDict_SetItemString(d,"VERTICAL_HATCH", SWIG_From_int((int)wxVERTICAL_HATCH));
+    PyDict_SetItemString(d,"JOIN_BEVEL", SWIG_From_int((int)wxJOIN_BEVEL));
+    PyDict_SetItemString(d,"JOIN_MITER", SWIG_From_int((int)wxJOIN_MITER));
+    PyDict_SetItemString(d,"JOIN_ROUND", SWIG_From_int((int)wxJOIN_ROUND));
+    PyDict_SetItemString(d,"CAP_ROUND", SWIG_From_int((int)wxCAP_ROUND));
+    PyDict_SetItemString(d,"CAP_PROJECTING", SWIG_From_int((int)wxCAP_PROJECTING));
+    PyDict_SetItemString(d,"CAP_BUTT", SWIG_From_int((int)wxCAP_BUTT));
+    PyDict_SetItemString(d,"CLEAR", SWIG_From_int((int)wxCLEAR));
+    PyDict_SetItemString(d,"XOR", SWIG_From_int((int)wxXOR));
+    PyDict_SetItemString(d,"INVERT", SWIG_From_int((int)wxINVERT));
+    PyDict_SetItemString(d,"OR_REVERSE", SWIG_From_int((int)wxOR_REVERSE));
+    PyDict_SetItemString(d,"AND_REVERSE", SWIG_From_int((int)wxAND_REVERSE));
+    PyDict_SetItemString(d,"COPY", SWIG_From_int((int)wxCOPY));
+    PyDict_SetItemString(d,"AND", SWIG_From_int((int)wxAND));
+    PyDict_SetItemString(d,"AND_INVERT", SWIG_From_int((int)wxAND_INVERT));
+    PyDict_SetItemString(d,"NO_OP", SWIG_From_int((int)wxNO_OP));
+    PyDict_SetItemString(d,"NOR", SWIG_From_int((int)wxNOR));
+    PyDict_SetItemString(d,"EQUIV", SWIG_From_int((int)wxEQUIV));
+    PyDict_SetItemString(d,"SRC_INVERT", SWIG_From_int((int)wxSRC_INVERT));
+    PyDict_SetItemString(d,"OR_INVERT", SWIG_From_int((int)wxOR_INVERT));
+    PyDict_SetItemString(d,"NAND", SWIG_From_int((int)wxNAND));
+    PyDict_SetItemString(d,"OR", SWIG_From_int((int)wxOR));
+    PyDict_SetItemString(d,"SET", SWIG_From_int((int)wxSET));
+    PyDict_SetItemString(d,"WXK_BACK", SWIG_From_int((int)WXK_BACK));
+    PyDict_SetItemString(d,"WXK_TAB", SWIG_From_int((int)WXK_TAB));
+    PyDict_SetItemString(d,"WXK_RETURN", SWIG_From_int((int)WXK_RETURN));
+    PyDict_SetItemString(d,"WXK_ESCAPE", SWIG_From_int((int)WXK_ESCAPE));
+    PyDict_SetItemString(d,"WXK_SPACE", SWIG_From_int((int)WXK_SPACE));
+    PyDict_SetItemString(d,"WXK_DELETE", SWIG_From_int((int)WXK_DELETE));
+    PyDict_SetItemString(d,"WXK_START", SWIG_From_int((int)WXK_START));
+    PyDict_SetItemString(d,"WXK_LBUTTON", SWIG_From_int((int)WXK_LBUTTON));
+    PyDict_SetItemString(d,"WXK_RBUTTON", SWIG_From_int((int)WXK_RBUTTON));
+    PyDict_SetItemString(d,"WXK_CANCEL", SWIG_From_int((int)WXK_CANCEL));
+    PyDict_SetItemString(d,"WXK_MBUTTON", SWIG_From_int((int)WXK_MBUTTON));
+    PyDict_SetItemString(d,"WXK_CLEAR", SWIG_From_int((int)WXK_CLEAR));
+    PyDict_SetItemString(d,"WXK_SHIFT", SWIG_From_int((int)WXK_SHIFT));
+    PyDict_SetItemString(d,"WXK_ALT", SWIG_From_int((int)WXK_ALT));
+    PyDict_SetItemString(d,"WXK_CONTROL", SWIG_From_int((int)WXK_CONTROL));
+    PyDict_SetItemString(d,"WXK_MENU", SWIG_From_int((int)WXK_MENU));
+    PyDict_SetItemString(d,"WXK_PAUSE", SWIG_From_int((int)WXK_PAUSE));
+    PyDict_SetItemString(d,"WXK_CAPITAL", SWIG_From_int((int)WXK_CAPITAL));
+    PyDict_SetItemString(d,"WXK_PRIOR", SWIG_From_int((int)WXK_PRIOR));
+    PyDict_SetItemString(d,"WXK_NEXT", SWIG_From_int((int)WXK_NEXT));
+    PyDict_SetItemString(d,"WXK_END", SWIG_From_int((int)WXK_END));
+    PyDict_SetItemString(d,"WXK_HOME", SWIG_From_int((int)WXK_HOME));
+    PyDict_SetItemString(d,"WXK_LEFT", SWIG_From_int((int)WXK_LEFT));
+    PyDict_SetItemString(d,"WXK_UP", SWIG_From_int((int)WXK_UP));
+    PyDict_SetItemString(d,"WXK_RIGHT", SWIG_From_int((int)WXK_RIGHT));
+    PyDict_SetItemString(d,"WXK_DOWN", SWIG_From_int((int)WXK_DOWN));
+    PyDict_SetItemString(d,"WXK_SELECT", SWIG_From_int((int)WXK_SELECT));
+    PyDict_SetItemString(d,"WXK_PRINT", SWIG_From_int((int)WXK_PRINT));
+    PyDict_SetItemString(d,"WXK_EXECUTE", SWIG_From_int((int)WXK_EXECUTE));
+    PyDict_SetItemString(d,"WXK_SNAPSHOT", SWIG_From_int((int)WXK_SNAPSHOT));
+    PyDict_SetItemString(d,"WXK_INSERT", SWIG_From_int((int)WXK_INSERT));
+    PyDict_SetItemString(d,"WXK_HELP", SWIG_From_int((int)WXK_HELP));
+    PyDict_SetItemString(d,"WXK_NUMPAD0", SWIG_From_int((int)WXK_NUMPAD0));
+    PyDict_SetItemString(d,"WXK_NUMPAD1", SWIG_From_int((int)WXK_NUMPAD1));
+    PyDict_SetItemString(d,"WXK_NUMPAD2", SWIG_From_int((int)WXK_NUMPAD2));
+    PyDict_SetItemString(d,"WXK_NUMPAD3", SWIG_From_int((int)WXK_NUMPAD3));
+    PyDict_SetItemString(d,"WXK_NUMPAD4", SWIG_From_int((int)WXK_NUMPAD4));
+    PyDict_SetItemString(d,"WXK_NUMPAD5", SWIG_From_int((int)WXK_NUMPAD5));
+    PyDict_SetItemString(d,"WXK_NUMPAD6", SWIG_From_int((int)WXK_NUMPAD6));
+    PyDict_SetItemString(d,"WXK_NUMPAD7", SWIG_From_int((int)WXK_NUMPAD7));
+    PyDict_SetItemString(d,"WXK_NUMPAD8", SWIG_From_int((int)WXK_NUMPAD8));
+    PyDict_SetItemString(d,"WXK_NUMPAD9", SWIG_From_int((int)WXK_NUMPAD9));
+    PyDict_SetItemString(d,"WXK_MULTIPLY", SWIG_From_int((int)WXK_MULTIPLY));
+    PyDict_SetItemString(d,"WXK_ADD", SWIG_From_int((int)WXK_ADD));
+    PyDict_SetItemString(d,"WXK_SEPARATOR", SWIG_From_int((int)WXK_SEPARATOR));
+    PyDict_SetItemString(d,"WXK_SUBTRACT", SWIG_From_int((int)WXK_SUBTRACT));
+    PyDict_SetItemString(d,"WXK_DECIMAL", SWIG_From_int((int)WXK_DECIMAL));
+    PyDict_SetItemString(d,"WXK_DIVIDE", SWIG_From_int((int)WXK_DIVIDE));
+    PyDict_SetItemString(d,"WXK_F1", SWIG_From_int((int)WXK_F1));
+    PyDict_SetItemString(d,"WXK_F2", SWIG_From_int((int)WXK_F2));
+    PyDict_SetItemString(d,"WXK_F3", SWIG_From_int((int)WXK_F3));
+    PyDict_SetItemString(d,"WXK_F4", SWIG_From_int((int)WXK_F4));
+    PyDict_SetItemString(d,"WXK_F5", SWIG_From_int((int)WXK_F5));
+    PyDict_SetItemString(d,"WXK_F6", SWIG_From_int((int)WXK_F6));
+    PyDict_SetItemString(d,"WXK_F7", SWIG_From_int((int)WXK_F7));
+    PyDict_SetItemString(d,"WXK_F8", SWIG_From_int((int)WXK_F8));
+    PyDict_SetItemString(d,"WXK_F9", SWIG_From_int((int)WXK_F9));
+    PyDict_SetItemString(d,"WXK_F10", SWIG_From_int((int)WXK_F10));
+    PyDict_SetItemString(d,"WXK_F11", SWIG_From_int((int)WXK_F11));
+    PyDict_SetItemString(d,"WXK_F12", SWIG_From_int((int)WXK_F12));
+    PyDict_SetItemString(d,"WXK_F13", SWIG_From_int((int)WXK_F13));
+    PyDict_SetItemString(d,"WXK_F14", SWIG_From_int((int)WXK_F14));
+    PyDict_SetItemString(d,"WXK_F15", SWIG_From_int((int)WXK_F15));
+    PyDict_SetItemString(d,"WXK_F16", SWIG_From_int((int)WXK_F16));
+    PyDict_SetItemString(d,"WXK_F17", SWIG_From_int((int)WXK_F17));
+    PyDict_SetItemString(d,"WXK_F18", SWIG_From_int((int)WXK_F18));
+    PyDict_SetItemString(d,"WXK_F19", SWIG_From_int((int)WXK_F19));
+    PyDict_SetItemString(d,"WXK_F20", SWIG_From_int((int)WXK_F20));
+    PyDict_SetItemString(d,"WXK_F21", SWIG_From_int((int)WXK_F21));
+    PyDict_SetItemString(d,"WXK_F22", SWIG_From_int((int)WXK_F22));
+    PyDict_SetItemString(d,"WXK_F23", SWIG_From_int((int)WXK_F23));
+    PyDict_SetItemString(d,"WXK_F24", SWIG_From_int((int)WXK_F24));
+    PyDict_SetItemString(d,"WXK_NUMLOCK", SWIG_From_int((int)WXK_NUMLOCK));
+    PyDict_SetItemString(d,"WXK_SCROLL", SWIG_From_int((int)WXK_SCROLL));
+    PyDict_SetItemString(d,"WXK_PAGEUP", SWIG_From_int((int)WXK_PAGEUP));
+    PyDict_SetItemString(d,"WXK_PAGEDOWN", SWIG_From_int((int)WXK_PAGEDOWN));
+    PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", SWIG_From_int((int)WXK_NUMPAD_SPACE));
+    PyDict_SetItemString(d,"WXK_NUMPAD_TAB", SWIG_From_int((int)WXK_NUMPAD_TAB));
+    PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", SWIG_From_int((int)WXK_NUMPAD_ENTER));
+    PyDict_SetItemString(d,"WXK_NUMPAD_F1", SWIG_From_int((int)WXK_NUMPAD_F1));
+    PyDict_SetItemString(d,"WXK_NUMPAD_F2", SWIG_From_int((int)WXK_NUMPAD_F2));
+    PyDict_SetItemString(d,"WXK_NUMPAD_F3", SWIG_From_int((int)WXK_NUMPAD_F3));
+    PyDict_SetItemString(d,"WXK_NUMPAD_F4", SWIG_From_int((int)WXK_NUMPAD_F4));
+    PyDict_SetItemString(d,"WXK_NUMPAD_HOME", SWIG_From_int((int)WXK_NUMPAD_HOME));
+    PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", SWIG_From_int((int)WXK_NUMPAD_LEFT));
+    PyDict_SetItemString(d,"WXK_NUMPAD_UP", SWIG_From_int((int)WXK_NUMPAD_UP));
+    PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", SWIG_From_int((int)WXK_NUMPAD_RIGHT));
+    PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", SWIG_From_int((int)WXK_NUMPAD_DOWN));
+    PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", SWIG_From_int((int)WXK_NUMPAD_PRIOR));
+    PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", SWIG_From_int((int)WXK_NUMPAD_PAGEUP));
+    PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", SWIG_From_int((int)WXK_NUMPAD_NEXT));
+    PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", SWIG_From_int((int)WXK_NUMPAD_PAGEDOWN));
+    PyDict_SetItemString(d,"WXK_NUMPAD_END", SWIG_From_int((int)WXK_NUMPAD_END));
+    PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", SWIG_From_int((int)WXK_NUMPAD_BEGIN));
+    PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", SWIG_From_int((int)WXK_NUMPAD_INSERT));
+    PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", SWIG_From_int((int)WXK_NUMPAD_DELETE));
+    PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", SWIG_From_int((int)WXK_NUMPAD_EQUAL));
+    PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", SWIG_From_int((int)WXK_NUMPAD_MULTIPLY));
+    PyDict_SetItemString(d,"WXK_NUMPAD_ADD", SWIG_From_int((int)WXK_NUMPAD_ADD));
+    PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", SWIG_From_int((int)WXK_NUMPAD_SEPARATOR));
+    PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", SWIG_From_int((int)WXK_NUMPAD_SUBTRACT));
+    PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", SWIG_From_int((int)WXK_NUMPAD_DECIMAL));
+    PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", SWIG_From_int((int)WXK_NUMPAD_DIVIDE));
+    PyDict_SetItemString(d,"WXK_WINDOWS_LEFT", SWIG_From_int((int)WXK_WINDOWS_LEFT));
+    PyDict_SetItemString(d,"WXK_WINDOWS_RIGHT", SWIG_From_int((int)WXK_WINDOWS_RIGHT));
+    PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)WXK_WINDOWS_MENU));
+    PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)wxPAPER_NONE));
+    PyDict_SetItemString(d,"PAPER_LETTER", SWIG_From_int((int)wxPAPER_LETTER));
+    PyDict_SetItemString(d,"PAPER_LEGAL", SWIG_From_int((int)wxPAPER_LEGAL));
+    PyDict_SetItemString(d,"PAPER_A4", SWIG_From_int((int)wxPAPER_A4));
+    PyDict_SetItemString(d,"PAPER_CSHEET", SWIG_From_int((int)wxPAPER_CSHEET));
+    PyDict_SetItemString(d,"PAPER_DSHEET", SWIG_From_int((int)wxPAPER_DSHEET));
+    PyDict_SetItemString(d,"PAPER_ESHEET", SWIG_From_int((int)wxPAPER_ESHEET));
+    PyDict_SetItemString(d,"PAPER_LETTERSMALL", SWIG_From_int((int)wxPAPER_LETTERSMALL));
+    PyDict_SetItemString(d,"PAPER_TABLOID", SWIG_From_int((int)wxPAPER_TABLOID));
+    PyDict_SetItemString(d,"PAPER_LEDGER", SWIG_From_int((int)wxPAPER_LEDGER));
+    PyDict_SetItemString(d,"PAPER_STATEMENT", SWIG_From_int((int)wxPAPER_STATEMENT));
+    PyDict_SetItemString(d,"PAPER_EXECUTIVE", SWIG_From_int((int)wxPAPER_EXECUTIVE));
+    PyDict_SetItemString(d,"PAPER_A3", SWIG_From_int((int)wxPAPER_A3));
+    PyDict_SetItemString(d,"PAPER_A4SMALL", SWIG_From_int((int)wxPAPER_A4SMALL));
+    PyDict_SetItemString(d,"PAPER_A5", SWIG_From_int((int)wxPAPER_A5));
+    PyDict_SetItemString(d,"PAPER_B4", SWIG_From_int((int)wxPAPER_B4));
+    PyDict_SetItemString(d,"PAPER_B5", SWIG_From_int((int)wxPAPER_B5));
+    PyDict_SetItemString(d,"PAPER_FOLIO", SWIG_From_int((int)wxPAPER_FOLIO));
+    PyDict_SetItemString(d,"PAPER_QUARTO", SWIG_From_int((int)wxPAPER_QUARTO));
+    PyDict_SetItemString(d,"PAPER_10X14", SWIG_From_int((int)wxPAPER_10X14));
+    PyDict_SetItemString(d,"PAPER_11X17", SWIG_From_int((int)wxPAPER_11X17));
+    PyDict_SetItemString(d,"PAPER_NOTE", SWIG_From_int((int)wxPAPER_NOTE));
+    PyDict_SetItemString(d,"PAPER_ENV_9", SWIG_From_int((int)wxPAPER_ENV_9));
+    PyDict_SetItemString(d,"PAPER_ENV_10", SWIG_From_int((int)wxPAPER_ENV_10));
+    PyDict_SetItemString(d,"PAPER_ENV_11", SWIG_From_int((int)wxPAPER_ENV_11));
+    PyDict_SetItemString(d,"PAPER_ENV_12", SWIG_From_int((int)wxPAPER_ENV_12));
+    PyDict_SetItemString(d,"PAPER_ENV_14", SWIG_From_int((int)wxPAPER_ENV_14));
+    PyDict_SetItemString(d,"PAPER_ENV_DL", SWIG_From_int((int)wxPAPER_ENV_DL));
+    PyDict_SetItemString(d,"PAPER_ENV_C5", SWIG_From_int((int)wxPAPER_ENV_C5));
+    PyDict_SetItemString(d,"PAPER_ENV_C3", SWIG_From_int((int)wxPAPER_ENV_C3));
+    PyDict_SetItemString(d,"PAPER_ENV_C4", SWIG_From_int((int)wxPAPER_ENV_C4));
+    PyDict_SetItemString(d,"PAPER_ENV_C6", SWIG_From_int((int)wxPAPER_ENV_C6));
+    PyDict_SetItemString(d,"PAPER_ENV_C65", SWIG_From_int((int)wxPAPER_ENV_C65));
+    PyDict_SetItemString(d,"PAPER_ENV_B4", SWIG_From_int((int)wxPAPER_ENV_B4));
+    PyDict_SetItemString(d,"PAPER_ENV_B5", SWIG_From_int((int)wxPAPER_ENV_B5));
+    PyDict_SetItemString(d,"PAPER_ENV_B6", SWIG_From_int((int)wxPAPER_ENV_B6));
+    PyDict_SetItemString(d,"PAPER_ENV_ITALY", SWIG_From_int((int)wxPAPER_ENV_ITALY));
+    PyDict_SetItemString(d,"PAPER_ENV_MONARCH", SWIG_From_int((int)wxPAPER_ENV_MONARCH));
+    PyDict_SetItemString(d,"PAPER_ENV_PERSONAL", SWIG_From_int((int)wxPAPER_ENV_PERSONAL));
+    PyDict_SetItemString(d,"PAPER_FANFOLD_US", SWIG_From_int((int)wxPAPER_FANFOLD_US));
+    PyDict_SetItemString(d,"PAPER_FANFOLD_STD_GERMAN", SWIG_From_int((int)wxPAPER_FANFOLD_STD_GERMAN));
+    PyDict_SetItemString(d,"PAPER_FANFOLD_LGL_GERMAN", SWIG_From_int((int)wxPAPER_FANFOLD_LGL_GERMAN));
+    PyDict_SetItemString(d,"PAPER_ISO_B4", SWIG_From_int((int)wxPAPER_ISO_B4));
+    PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD", SWIG_From_int((int)wxPAPER_JAPANESE_POSTCARD));
+    PyDict_SetItemString(d,"PAPER_9X11", SWIG_From_int((int)wxPAPER_9X11));
+    PyDict_SetItemString(d,"PAPER_10X11", SWIG_From_int((int)wxPAPER_10X11));
+    PyDict_SetItemString(d,"PAPER_15X11", SWIG_From_int((int)wxPAPER_15X11));
+    PyDict_SetItemString(d,"PAPER_ENV_INVITE", SWIG_From_int((int)wxPAPER_ENV_INVITE));
+    PyDict_SetItemString(d,"PAPER_LETTER_EXTRA", SWIG_From_int((int)wxPAPER_LETTER_EXTRA));
+    PyDict_SetItemString(d,"PAPER_LEGAL_EXTRA", SWIG_From_int((int)wxPAPER_LEGAL_EXTRA));
+    PyDict_SetItemString(d,"PAPER_TABLOID_EXTRA", SWIG_From_int((int)wxPAPER_TABLOID_EXTRA));
+    PyDict_SetItemString(d,"PAPER_A4_EXTRA", SWIG_From_int((int)wxPAPER_A4_EXTRA));
+    PyDict_SetItemString(d,"PAPER_LETTER_TRANSVERSE", SWIG_From_int((int)wxPAPER_LETTER_TRANSVERSE));
+    PyDict_SetItemString(d,"PAPER_A4_TRANSVERSE", SWIG_From_int((int)wxPAPER_A4_TRANSVERSE));
+    PyDict_SetItemString(d,"PAPER_LETTER_EXTRA_TRANSVERSE", SWIG_From_int((int)wxPAPER_LETTER_EXTRA_TRANSVERSE));
+    PyDict_SetItemString(d,"PAPER_A_PLUS", SWIG_From_int((int)wxPAPER_A_PLUS));
+    PyDict_SetItemString(d,"PAPER_B_PLUS", SWIG_From_int((int)wxPAPER_B_PLUS));
+    PyDict_SetItemString(d,"PAPER_LETTER_PLUS", SWIG_From_int((int)wxPAPER_LETTER_PLUS));
+    PyDict_SetItemString(d,"PAPER_A4_PLUS", SWIG_From_int((int)wxPAPER_A4_PLUS));
+    PyDict_SetItemString(d,"PAPER_A5_TRANSVERSE", SWIG_From_int((int)wxPAPER_A5_TRANSVERSE));
+    PyDict_SetItemString(d,"PAPER_B5_TRANSVERSE", SWIG_From_int((int)wxPAPER_B5_TRANSVERSE));
+    PyDict_SetItemString(d,"PAPER_A3_EXTRA", SWIG_From_int((int)wxPAPER_A3_EXTRA));
+    PyDict_SetItemString(d,"PAPER_A5_EXTRA", SWIG_From_int((int)wxPAPER_A5_EXTRA));
+    PyDict_SetItemString(d,"PAPER_B5_EXTRA", SWIG_From_int((int)wxPAPER_B5_EXTRA));
+    PyDict_SetItemString(d,"PAPER_A2", SWIG_From_int((int)wxPAPER_A2));
+    PyDict_SetItemString(d,"PAPER_A3_TRANSVERSE", SWIG_From_int((int)wxPAPER_A3_TRANSVERSE));
+    PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_From_int((int)wxPAPER_A3_EXTRA_TRANSVERSE));
+    PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_From_int((int)wxDUPLEX_SIMPLEX));
+    PyDict_SetItemString(d,"DUPLEX_HORIZONTAL", SWIG_From_int((int)wxDUPLEX_HORIZONTAL));
+    PyDict_SetItemString(d,"DUPLEX_VERTICAL", SWIG_From_int((int)wxDUPLEX_VERTICAL));
+    PyDict_SetItemString(d,"ITEM_SEPARATOR", SWIG_From_int((int)wxITEM_SEPARATOR));
+    PyDict_SetItemString(d,"ITEM_NORMAL", SWIG_From_int((int)wxITEM_NORMAL));
+    PyDict_SetItemString(d,"ITEM_CHECK", SWIG_From_int((int)wxITEM_CHECK));
+    PyDict_SetItemString(d,"ITEM_RADIO", SWIG_From_int((int)wxITEM_RADIO));
+    PyDict_SetItemString(d,"ITEM_MAX", SWIG_From_int((int)wxITEM_MAX));
+    PyDict_SetItemString(d,"HT_NOWHERE", SWIG_From_int((int)wxHT_NOWHERE));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_FIRST", SWIG_From_int((int)wxHT_SCROLLBAR_FIRST));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_1", SWIG_From_int((int)wxHT_SCROLLBAR_ARROW_LINE_1));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_LINE_2", SWIG_From_int((int)wxHT_SCROLLBAR_ARROW_LINE_2));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_1", SWIG_From_int((int)wxHT_SCROLLBAR_ARROW_PAGE_1));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_ARROW_PAGE_2", SWIG_From_int((int)wxHT_SCROLLBAR_ARROW_PAGE_2));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_THUMB", SWIG_From_int((int)wxHT_SCROLLBAR_THUMB));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_1", SWIG_From_int((int)wxHT_SCROLLBAR_BAR_1));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_BAR_2", SWIG_From_int((int)wxHT_SCROLLBAR_BAR_2));
+    PyDict_SetItemString(d,"HT_SCROLLBAR_LAST", SWIG_From_int((int)wxHT_SCROLLBAR_LAST));
+    PyDict_SetItemString(d,"HT_WINDOW_OUTSIDE", SWIG_From_int((int)wxHT_WINDOW_OUTSIDE));
+    PyDict_SetItemString(d,"HT_WINDOW_INSIDE", SWIG_From_int((int)wxHT_WINDOW_INSIDE));
+    PyDict_SetItemString(d,"HT_WINDOW_VERT_SCROLLBAR", SWIG_From_int((int)wxHT_WINDOW_VERT_SCROLLBAR));
+    PyDict_SetItemString(d,"HT_WINDOW_HORZ_SCROLLBAR", SWIG_From_int((int)wxHT_WINDOW_HORZ_SCROLLBAR));
+    PyDict_SetItemString(d,"HT_WINDOW_CORNER", SWIG_From_int((int)wxHT_WINDOW_CORNER));
+    PyDict_SetItemString(d,"HT_MAX", SWIG_From_int((int)wxHT_MAX));
+    PyDict_SetItemString(d,"MOD_NONE", SWIG_From_int((int)wxMOD_NONE));
+    PyDict_SetItemString(d,"MOD_ALT", SWIG_From_int((int)wxMOD_ALT));
+    PyDict_SetItemString(d,"MOD_CONTROL", SWIG_From_int((int)wxMOD_CONTROL));
+    PyDict_SetItemString(d,"MOD_SHIFT", SWIG_From_int((int)wxMOD_SHIFT));
+    PyDict_SetItemString(d,"MOD_WIN", SWIG_From_int((int)wxMOD_WIN));
+    PyDict_SetItemString(d,"UPDATE_UI_NONE", SWIG_From_int((int)wxUPDATE_UI_NONE));
+    PyDict_SetItemString(d,"UPDATE_UI_RECURSE", SWIG_From_int((int)wxUPDATE_UI_RECURSE));
+    PyDict_SetItemString(d,"UPDATE_UI_FROMIDLE", SWIG_From_int((int)wxUPDATE_UI_FROMIDLE));
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"EmptyString",_wrap_EmptyString_get, _wrap_EmptyString_set);
-    PyDict_SetItemString(d,"BITMAP_TYPE_INVALID", SWIG_FromInt((int)wxBITMAP_TYPE_INVALID));
-    PyDict_SetItemString(d,"BITMAP_TYPE_BMP", SWIG_FromInt((int)wxBITMAP_TYPE_BMP));
-    PyDict_SetItemString(d,"BITMAP_TYPE_ICO", SWIG_FromInt((int)wxBITMAP_TYPE_ICO));
-    PyDict_SetItemString(d,"BITMAP_TYPE_CUR", SWIG_FromInt((int)wxBITMAP_TYPE_CUR));
-    PyDict_SetItemString(d,"BITMAP_TYPE_XBM", SWIG_FromInt((int)wxBITMAP_TYPE_XBM));
-    PyDict_SetItemString(d,"BITMAP_TYPE_XBM_DATA", SWIG_FromInt((int)wxBITMAP_TYPE_XBM_DATA));
-    PyDict_SetItemString(d,"BITMAP_TYPE_XPM", SWIG_FromInt((int)wxBITMAP_TYPE_XPM));
-    PyDict_SetItemString(d,"BITMAP_TYPE_XPM_DATA", SWIG_FromInt((int)wxBITMAP_TYPE_XPM_DATA));
-    PyDict_SetItemString(d,"BITMAP_TYPE_TIF", SWIG_FromInt((int)wxBITMAP_TYPE_TIF));
-    PyDict_SetItemString(d,"BITMAP_TYPE_GIF", SWIG_FromInt((int)wxBITMAP_TYPE_GIF));
-    PyDict_SetItemString(d,"BITMAP_TYPE_PNG", SWIG_FromInt((int)wxBITMAP_TYPE_PNG));
-    PyDict_SetItemString(d,"BITMAP_TYPE_JPEG", SWIG_FromInt((int)wxBITMAP_TYPE_JPEG));
-    PyDict_SetItemString(d,"BITMAP_TYPE_PNM", SWIG_FromInt((int)wxBITMAP_TYPE_PNM));
-    PyDict_SetItemString(d,"BITMAP_TYPE_PCX", SWIG_FromInt((int)wxBITMAP_TYPE_PCX));
-    PyDict_SetItemString(d,"BITMAP_TYPE_PICT", SWIG_FromInt((int)wxBITMAP_TYPE_PICT));
-    PyDict_SetItemString(d,"BITMAP_TYPE_ICON", SWIG_FromInt((int)wxBITMAP_TYPE_ICON));
-    PyDict_SetItemString(d,"BITMAP_TYPE_ANI", SWIG_FromInt((int)wxBITMAP_TYPE_ANI));
-    PyDict_SetItemString(d,"BITMAP_TYPE_IFF", SWIG_FromInt((int)wxBITMAP_TYPE_IFF));
-    PyDict_SetItemString(d,"BITMAP_TYPE_MACCURSOR", SWIG_FromInt((int)wxBITMAP_TYPE_MACCURSOR));
-    PyDict_SetItemString(d,"BITMAP_TYPE_ANY", SWIG_FromInt((int)wxBITMAP_TYPE_ANY));
-    PyDict_SetItemString(d,"CURSOR_NONE", SWIG_FromInt((int)wxCURSOR_NONE));
-    PyDict_SetItemString(d,"CURSOR_ARROW", SWIG_FromInt((int)wxCURSOR_ARROW));
-    PyDict_SetItemString(d,"CURSOR_RIGHT_ARROW", SWIG_FromInt((int)wxCURSOR_RIGHT_ARROW));
-    PyDict_SetItemString(d,"CURSOR_BULLSEYE", SWIG_FromInt((int)wxCURSOR_BULLSEYE));
-    PyDict_SetItemString(d,"CURSOR_CHAR", SWIG_FromInt((int)wxCURSOR_CHAR));
-    PyDict_SetItemString(d,"CURSOR_CROSS", SWIG_FromInt((int)wxCURSOR_CROSS));
-    PyDict_SetItemString(d,"CURSOR_HAND", SWIG_FromInt((int)wxCURSOR_HAND));
-    PyDict_SetItemString(d,"CURSOR_IBEAM", SWIG_FromInt((int)wxCURSOR_IBEAM));
-    PyDict_SetItemString(d,"CURSOR_LEFT_BUTTON", SWIG_FromInt((int)wxCURSOR_LEFT_BUTTON));
-    PyDict_SetItemString(d,"CURSOR_MAGNIFIER", SWIG_FromInt((int)wxCURSOR_MAGNIFIER));
-    PyDict_SetItemString(d,"CURSOR_MIDDLE_BUTTON", SWIG_FromInt((int)wxCURSOR_MIDDLE_BUTTON));
-    PyDict_SetItemString(d,"CURSOR_NO_ENTRY", SWIG_FromInt((int)wxCURSOR_NO_ENTRY));
-    PyDict_SetItemString(d,"CURSOR_PAINT_BRUSH", SWIG_FromInt((int)wxCURSOR_PAINT_BRUSH));
-    PyDict_SetItemString(d,"CURSOR_PENCIL", SWIG_FromInt((int)wxCURSOR_PENCIL));
-    PyDict_SetItemString(d,"CURSOR_POINT_LEFT", SWIG_FromInt((int)wxCURSOR_POINT_LEFT));
-    PyDict_SetItemString(d,"CURSOR_POINT_RIGHT", SWIG_FromInt((int)wxCURSOR_POINT_RIGHT));
-    PyDict_SetItemString(d,"CURSOR_QUESTION_ARROW", SWIG_FromInt((int)wxCURSOR_QUESTION_ARROW));
-    PyDict_SetItemString(d,"CURSOR_RIGHT_BUTTON", SWIG_FromInt((int)wxCURSOR_RIGHT_BUTTON));
-    PyDict_SetItemString(d,"CURSOR_SIZENESW", SWIG_FromInt((int)wxCURSOR_SIZENESW));
-    PyDict_SetItemString(d,"CURSOR_SIZENS", SWIG_FromInt((int)wxCURSOR_SIZENS));
-    PyDict_SetItemString(d,"CURSOR_SIZENWSE", SWIG_FromInt((int)wxCURSOR_SIZENWSE));
-    PyDict_SetItemString(d,"CURSOR_SIZEWE", SWIG_FromInt((int)wxCURSOR_SIZEWE));
-    PyDict_SetItemString(d,"CURSOR_SIZING", SWIG_FromInt((int)wxCURSOR_SIZING));
-    PyDict_SetItemString(d,"CURSOR_SPRAYCAN", SWIG_FromInt((int)wxCURSOR_SPRAYCAN));
-    PyDict_SetItemString(d,"CURSOR_WAIT", SWIG_FromInt((int)wxCURSOR_WAIT));
-    PyDict_SetItemString(d,"CURSOR_WATCH", SWIG_FromInt((int)wxCURSOR_WATCH));
-    PyDict_SetItemString(d,"CURSOR_BLANK", SWIG_FromInt((int)wxCURSOR_BLANK));
-    PyDict_SetItemString(d,"CURSOR_DEFAULT", SWIG_FromInt((int)wxCURSOR_DEFAULT));
-    PyDict_SetItemString(d,"CURSOR_COPY_ARROW", SWIG_FromInt((int)wxCURSOR_COPY_ARROW));
-    PyDict_SetItemString(d,"CURSOR_ARROWWAIT", SWIG_FromInt((int)wxCURSOR_ARROWWAIT));
-    PyDict_SetItemString(d,"CURSOR_MAX", SWIG_FromInt((int)wxCURSOR_MAX));
+    PyDict_SetItemString(d,"BITMAP_TYPE_INVALID", SWIG_From_int((int)wxBITMAP_TYPE_INVALID));
+    PyDict_SetItemString(d,"BITMAP_TYPE_BMP", SWIG_From_int((int)wxBITMAP_TYPE_BMP));
+    PyDict_SetItemString(d,"BITMAP_TYPE_ICO", SWIG_From_int((int)wxBITMAP_TYPE_ICO));
+    PyDict_SetItemString(d,"BITMAP_TYPE_CUR", SWIG_From_int((int)wxBITMAP_TYPE_CUR));
+    PyDict_SetItemString(d,"BITMAP_TYPE_XBM", SWIG_From_int((int)wxBITMAP_TYPE_XBM));
+    PyDict_SetItemString(d,"BITMAP_TYPE_XBM_DATA", SWIG_From_int((int)wxBITMAP_TYPE_XBM_DATA));
+    PyDict_SetItemString(d,"BITMAP_TYPE_XPM", SWIG_From_int((int)wxBITMAP_TYPE_XPM));
+    PyDict_SetItemString(d,"BITMAP_TYPE_XPM_DATA", SWIG_From_int((int)wxBITMAP_TYPE_XPM_DATA));
+    PyDict_SetItemString(d,"BITMAP_TYPE_TIF", SWIG_From_int((int)wxBITMAP_TYPE_TIF));
+    PyDict_SetItemString(d,"BITMAP_TYPE_GIF", SWIG_From_int((int)wxBITMAP_TYPE_GIF));
+    PyDict_SetItemString(d,"BITMAP_TYPE_PNG", SWIG_From_int((int)wxBITMAP_TYPE_PNG));
+    PyDict_SetItemString(d,"BITMAP_TYPE_JPEG", SWIG_From_int((int)wxBITMAP_TYPE_JPEG));
+    PyDict_SetItemString(d,"BITMAP_TYPE_PNM", SWIG_From_int((int)wxBITMAP_TYPE_PNM));
+    PyDict_SetItemString(d,"BITMAP_TYPE_PCX", SWIG_From_int((int)wxBITMAP_TYPE_PCX));
+    PyDict_SetItemString(d,"BITMAP_TYPE_PICT", SWIG_From_int((int)wxBITMAP_TYPE_PICT));
+    PyDict_SetItemString(d,"BITMAP_TYPE_ICON", SWIG_From_int((int)wxBITMAP_TYPE_ICON));
+    PyDict_SetItemString(d,"BITMAP_TYPE_ANI", SWIG_From_int((int)wxBITMAP_TYPE_ANI));
+    PyDict_SetItemString(d,"BITMAP_TYPE_IFF", SWIG_From_int((int)wxBITMAP_TYPE_IFF));
+    PyDict_SetItemString(d,"BITMAP_TYPE_MACCURSOR", SWIG_From_int((int)wxBITMAP_TYPE_MACCURSOR));
+    PyDict_SetItemString(d,"BITMAP_TYPE_ANY", SWIG_From_int((int)wxBITMAP_TYPE_ANY));
+    PyDict_SetItemString(d,"CURSOR_NONE", SWIG_From_int((int)wxCURSOR_NONE));
+    PyDict_SetItemString(d,"CURSOR_ARROW", SWIG_From_int((int)wxCURSOR_ARROW));
+    PyDict_SetItemString(d,"CURSOR_RIGHT_ARROW", SWIG_From_int((int)wxCURSOR_RIGHT_ARROW));
+    PyDict_SetItemString(d,"CURSOR_BULLSEYE", SWIG_From_int((int)wxCURSOR_BULLSEYE));
+    PyDict_SetItemString(d,"CURSOR_CHAR", SWIG_From_int((int)wxCURSOR_CHAR));
+    PyDict_SetItemString(d,"CURSOR_CROSS", SWIG_From_int((int)wxCURSOR_CROSS));
+    PyDict_SetItemString(d,"CURSOR_HAND", SWIG_From_int((int)wxCURSOR_HAND));
+    PyDict_SetItemString(d,"CURSOR_IBEAM", SWIG_From_int((int)wxCURSOR_IBEAM));
+    PyDict_SetItemString(d,"CURSOR_LEFT_BUTTON", SWIG_From_int((int)wxCURSOR_LEFT_BUTTON));
+    PyDict_SetItemString(d,"CURSOR_MAGNIFIER", SWIG_From_int((int)wxCURSOR_MAGNIFIER));
+    PyDict_SetItemString(d,"CURSOR_MIDDLE_BUTTON", SWIG_From_int((int)wxCURSOR_MIDDLE_BUTTON));
+    PyDict_SetItemString(d,"CURSOR_NO_ENTRY", SWIG_From_int((int)wxCURSOR_NO_ENTRY));
+    PyDict_SetItemString(d,"CURSOR_PAINT_BRUSH", SWIG_From_int((int)wxCURSOR_PAINT_BRUSH));
+    PyDict_SetItemString(d,"CURSOR_PENCIL", SWIG_From_int((int)wxCURSOR_PENCIL));
+    PyDict_SetItemString(d,"CURSOR_POINT_LEFT", SWIG_From_int((int)wxCURSOR_POINT_LEFT));
+    PyDict_SetItemString(d,"CURSOR_POINT_RIGHT", SWIG_From_int((int)wxCURSOR_POINT_RIGHT));
+    PyDict_SetItemString(d,"CURSOR_QUESTION_ARROW", SWIG_From_int((int)wxCURSOR_QUESTION_ARROW));
+    PyDict_SetItemString(d,"CURSOR_RIGHT_BUTTON", SWIG_From_int((int)wxCURSOR_RIGHT_BUTTON));
+    PyDict_SetItemString(d,"CURSOR_SIZENESW", SWIG_From_int((int)wxCURSOR_SIZENESW));
+    PyDict_SetItemString(d,"CURSOR_SIZENS", SWIG_From_int((int)wxCURSOR_SIZENS));
+    PyDict_SetItemString(d,"CURSOR_SIZENWSE", SWIG_From_int((int)wxCURSOR_SIZENWSE));
+    PyDict_SetItemString(d,"CURSOR_SIZEWE", SWIG_From_int((int)wxCURSOR_SIZEWE));
+    PyDict_SetItemString(d,"CURSOR_SIZING", SWIG_From_int((int)wxCURSOR_SIZING));
+    PyDict_SetItemString(d,"CURSOR_SPRAYCAN", SWIG_From_int((int)wxCURSOR_SPRAYCAN));
+    PyDict_SetItemString(d,"CURSOR_WAIT", SWIG_From_int((int)wxCURSOR_WAIT));
+    PyDict_SetItemString(d,"CURSOR_WATCH", SWIG_From_int((int)wxCURSOR_WATCH));
+    PyDict_SetItemString(d,"CURSOR_BLANK", SWIG_From_int((int)wxCURSOR_BLANK));
+    PyDict_SetItemString(d,"CURSOR_DEFAULT", SWIG_From_int((int)wxCURSOR_DEFAULT));
+    PyDict_SetItemString(d,"CURSOR_COPY_ARROW", SWIG_From_int((int)wxCURSOR_COPY_ARROW));
+    PyDict_SetItemString(d,"CURSOR_ARROWWAIT", SWIG_From_int((int)wxCURSOR_ARROWWAIT));
+    PyDict_SetItemString(d,"CURSOR_MAX", SWIG_From_int((int)wxCURSOR_MAX));
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultPosition",_wrap_DefaultPosition_get, _wrap_DefaultPosition_set);
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultSize",_wrap_DefaultSize_get, _wrap_DefaultSize_set);
-    PyDict_SetItemString(d,"FromStart", SWIG_FromInt((int)wxFromStart));
-    PyDict_SetItemString(d,"FromCurrent", SWIG_FromInt((int)wxFromCurrent));
-    PyDict_SetItemString(d,"FromEnd", SWIG_FromInt((int)wxFromEnd));
+    PyDict_SetItemString(d,"FromStart", SWIG_From_int((int)wxFromStart));
+    PyDict_SetItemString(d,"FromCurrent", SWIG_From_int((int)wxFromCurrent));
+    PyDict_SetItemString(d,"FromEnd", SWIG_From_int((int)wxFromEnd));
     
     wxPyPtrTypeMap_Add("wxInputStream", "wxPyInputStream");
     
@@ -42708,21 +42879,21 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_CUR_HOTSPOT_Y",_wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_get, _wrap_IMAGE_OPTION_CUR_HOTSPOT_Y_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTION",_wrap_IMAGE_OPTION_RESOLUTION_get, _wrap_IMAGE_OPTION_RESOLUTION_set);
     SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_RESOLUTIONUNIT",_wrap_IMAGE_OPTION_RESOLUTIONUNIT_get, _wrap_IMAGE_OPTION_RESOLUTIONUNIT_set);
-    PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_FromInt((int)wxIMAGE_RESOLUTION_INCHES));
-    PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_FromInt((int)wxIMAGE_RESOLUTION_CM));
-    PyDict_SetItemString(d,"BMP_24BPP", SWIG_FromInt((int)wxBMP_24BPP));
-    PyDict_SetItemString(d,"BMP_8BPP", SWIG_FromInt((int)wxBMP_8BPP));
-    PyDict_SetItemString(d,"BMP_8BPP_GREY", SWIG_FromInt((int)wxBMP_8BPP_GREY));
-    PyDict_SetItemString(d,"BMP_8BPP_GRAY", SWIG_FromInt((int)wxBMP_8BPP_GRAY));
-    PyDict_SetItemString(d,"BMP_8BPP_RED", SWIG_FromInt((int)wxBMP_8BPP_RED));
-    PyDict_SetItemString(d,"BMP_8BPP_PALETTE", SWIG_FromInt((int)wxBMP_8BPP_PALETTE));
-    PyDict_SetItemString(d,"BMP_4BPP", SWIG_FromInt((int)wxBMP_4BPP));
-    PyDict_SetItemString(d,"BMP_1BPP", SWIG_FromInt((int)wxBMP_1BPP));
-    PyDict_SetItemString(d,"BMP_1BPP_BW", SWIG_FromInt((int)wxBMP_1BPP_BW));
-    PyDict_SetItemString(d,"QUANTIZE_INCLUDE_WINDOWS_COLOURS", SWIG_FromInt((int)wxQUANTIZE_INCLUDE_WINDOWS_COLOURS));
-    PyDict_SetItemString(d,"QUANTIZE_FILL_DESTINATION_IMAGE", SWIG_FromInt((int)wxQUANTIZE_FILL_DESTINATION_IMAGE));
-    PyDict_SetItemString(d,"EVENT_PROPAGATE_NONE", SWIG_FromInt((int)wxEVENT_PROPAGATE_NONE));
-    PyDict_SetItemString(d,"EVENT_PROPAGATE_MAX", SWIG_FromInt((int)wxEVENT_PROPAGATE_MAX));
+    PyDict_SetItemString(d,"IMAGE_RESOLUTION_INCHES", SWIG_From_int((int)wxIMAGE_RESOLUTION_INCHES));
+    PyDict_SetItemString(d,"IMAGE_RESOLUTION_CM", SWIG_From_int((int)wxIMAGE_RESOLUTION_CM));
+    PyDict_SetItemString(d,"BMP_24BPP", SWIG_From_int((int)wxBMP_24BPP));
+    PyDict_SetItemString(d,"BMP_8BPP", SWIG_From_int((int)wxBMP_8BPP));
+    PyDict_SetItemString(d,"BMP_8BPP_GREY", SWIG_From_int((int)wxBMP_8BPP_GREY));
+    PyDict_SetItemString(d,"BMP_8BPP_GRAY", SWIG_From_int((int)wxBMP_8BPP_GRAY));
+    PyDict_SetItemString(d,"BMP_8BPP_RED", SWIG_From_int((int)wxBMP_8BPP_RED));
+    PyDict_SetItemString(d,"BMP_8BPP_PALETTE", SWIG_From_int((int)wxBMP_8BPP_PALETTE));
+    PyDict_SetItemString(d,"BMP_4BPP", SWIG_From_int((int)wxBMP_4BPP));
+    PyDict_SetItemString(d,"BMP_1BPP", SWIG_From_int((int)wxBMP_1BPP));
+    PyDict_SetItemString(d,"BMP_1BPP_BW", SWIG_From_int((int)wxBMP_1BPP_BW));
+    PyDict_SetItemString(d,"QUANTIZE_INCLUDE_WINDOWS_COLOURS", SWIG_From_int((int)wxQUANTIZE_INCLUDE_WINDOWS_COLOURS));
+    PyDict_SetItemString(d,"QUANTIZE_FILL_DESTINATION_IMAGE", SWIG_From_int((int)wxQUANTIZE_FILL_DESTINATION_IMAGE));
+    PyDict_SetItemString(d,"EVENT_PROPAGATE_NONE", SWIG_From_int((int)wxEVENT_PROPAGATE_NONE));
+    PyDict_SetItemString(d,"EVENT_PROPAGATE_MAX", SWIG_From_int((int)wxEVENT_PROPAGATE_MAX));
     PyDict_SetItemString(d, "wxEVT_NULL", PyInt_FromLong(wxEVT_NULL));
     PyDict_SetItemString(d, "wxEVT_FIRST", PyInt_FromLong(wxEVT_FIRST));
     PyDict_SetItemString(d, "wxEVT_USER_FIRST", PyInt_FromLong(wxEVT_USER_FIRST));
@@ -42837,56 +43008,56 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d, "wxEVT_COMMAND_SET_FOCUS", PyInt_FromLong(wxEVT_COMMAND_SET_FOCUS));
     PyDict_SetItemString(d, "wxEVT_COMMAND_KILL_FOCUS", PyInt_FromLong(wxEVT_COMMAND_KILL_FOCUS));
     PyDict_SetItemString(d, "wxEVT_COMMAND_ENTER", PyInt_FromLong(wxEVT_COMMAND_ENTER));
-    PyDict_SetItemString(d,"MOUSE_BTN_ANY", SWIG_FromInt((int)wxMOUSE_BTN_ANY));
-    PyDict_SetItemString(d,"MOUSE_BTN_NONE", SWIG_FromInt((int)wxMOUSE_BTN_NONE));
-    PyDict_SetItemString(d,"MOUSE_BTN_LEFT", SWIG_FromInt((int)wxMOUSE_BTN_LEFT));
-    PyDict_SetItemString(d,"MOUSE_BTN_MIDDLE", SWIG_FromInt((int)wxMOUSE_BTN_MIDDLE));
-    PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT));
-    PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL));
-    PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED));
-    PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_FromInt((int)wxNavigationKeyEvent::IsBackward));
-    PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward));
-    PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange));
-    PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL));
-    PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_FromInt((int)wxIDLE_PROCESS_SPECIFIED));
-    PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_FromInt((int)wxPYAPP_ASSERT_SUPPRESS));
-    PyDict_SetItemString(d,"PYAPP_ASSERT_EXCEPTION", SWIG_FromInt((int)wxPYAPP_ASSERT_EXCEPTION));
-    PyDict_SetItemString(d,"PYAPP_ASSERT_DIALOG", SWIG_FromInt((int)wxPYAPP_ASSERT_DIALOG));
-    PyDict_SetItemString(d,"PYAPP_ASSERT_LOG", SWIG_FromInt((int)wxPYAPP_ASSERT_LOG));
-    PyDict_SetItemString(d,"PRINT_WINDOWS", SWIG_FromInt((int)wxPRINT_WINDOWS));
-    PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_FromInt((int)wxPRINT_POSTSCRIPT));
+    PyDict_SetItemString(d,"MOUSE_BTN_ANY", SWIG_From_int((int)wxMOUSE_BTN_ANY));
+    PyDict_SetItemString(d,"MOUSE_BTN_NONE", SWIG_From_int((int)wxMOUSE_BTN_NONE));
+    PyDict_SetItemString(d,"MOUSE_BTN_LEFT", SWIG_From_int((int)wxMOUSE_BTN_LEFT));
+    PyDict_SetItemString(d,"MOUSE_BTN_MIDDLE", SWIG_From_int((int)wxMOUSE_BTN_MIDDLE));
+    PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_From_int((int)wxMOUSE_BTN_RIGHT));
+    PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_From_int((int)wxUPDATE_UI_PROCESS_ALL));
+    PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_From_int((int)wxUPDATE_UI_PROCESS_SPECIFIED));
+    PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_From_int((int)wxNavigationKeyEvent::IsBackward));
+    PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_From_int((int)wxNavigationKeyEvent::IsForward));
+    PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_From_int((int)wxNavigationKeyEvent::WinChange));
+    PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_From_int((int)wxIDLE_PROCESS_ALL));
+    PyDict_SetItemString(d,"IDLE_PROCESS_SPECIFIED", SWIG_From_int((int)wxIDLE_PROCESS_SPECIFIED));
+    PyDict_SetItemString(d,"PYAPP_ASSERT_SUPPRESS", SWIG_From_int((int)wxPYAPP_ASSERT_SUPPRESS));
+    PyDict_SetItemString(d,"PYAPP_ASSERT_EXCEPTION", SWIG_From_int((int)wxPYAPP_ASSERT_EXCEPTION));
+    PyDict_SetItemString(d,"PYAPP_ASSERT_DIALOG", SWIG_From_int((int)wxPYAPP_ASSERT_DIALOG));
+    PyDict_SetItemString(d,"PYAPP_ASSERT_LOG", SWIG_From_int((int)wxPYAPP_ASSERT_LOG));
+    PyDict_SetItemString(d,"PRINT_WINDOWS", SWIG_From_int((int)wxPRINT_WINDOWS));
+    PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_From_int((int)wxPRINT_POSTSCRIPT));
     SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set);
     SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set);
-    PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_FromInt((int)wxWINDOW_VARIANT_NORMAL));
-    PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_FromInt((int)wxWINDOW_VARIANT_SMALL));
-    PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_FromInt((int)wxWINDOW_VARIANT_MINI));
-    PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_FromInt((int)wxWINDOW_VARIANT_LARGE));
-    PyDict_SetItemString(d,"WINDOW_VARIANT_MAX", SWIG_FromInt((int)wxWINDOW_VARIANT_MAX));
+    PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_From_int((int)wxWINDOW_VARIANT_NORMAL));
+    PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_From_int((int)wxWINDOW_VARIANT_SMALL));
+    PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_From_int((int)wxWINDOW_VARIANT_MINI));
+    PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_From_int((int)wxWINDOW_VARIANT_LARGE));
+    PyDict_SetItemString(d,"WINDOW_VARIANT_MAX", SWIG_From_int((int)wxWINDOW_VARIANT_MAX));
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set);
-    PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_FromInt((int)wxFLEX_GROWMODE_NONE));
-    PyDict_SetItemString(d,"FLEX_GROWMODE_SPECIFIED", SWIG_FromInt((int)wxFLEX_GROWMODE_SPECIFIED));
-    PyDict_SetItemString(d,"FLEX_GROWMODE_ALL", SWIG_FromInt((int)wxFLEX_GROWMODE_ALL));
+    PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_From_int((int)wxFLEX_GROWMODE_NONE));
+    PyDict_SetItemString(d,"FLEX_GROWMODE_SPECIFIED", SWIG_From_int((int)wxFLEX_GROWMODE_SPECIFIED));
+    PyDict_SetItemString(d,"FLEX_GROWMODE_ALL", SWIG_From_int((int)wxFLEX_GROWMODE_ALL));
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultSpan",_wrap_DefaultSpan_get, _wrap_DefaultSpan_set);
-    PyDict_SetItemString(d,"Left", SWIG_FromInt((int)wxLeft));
-    PyDict_SetItemString(d,"Top", SWIG_FromInt((int)wxTop));
-    PyDict_SetItemString(d,"Right", SWIG_FromInt((int)wxRight));
-    PyDict_SetItemString(d,"Bottom", SWIG_FromInt((int)wxBottom));
-    PyDict_SetItemString(d,"Width", SWIG_FromInt((int)wxWidth));
-    PyDict_SetItemString(d,"Height", SWIG_FromInt((int)wxHeight));
-    PyDict_SetItemString(d,"Centre", SWIG_FromInt((int)wxCentre));
-    PyDict_SetItemString(d,"Center", SWIG_FromInt((int)wxCenter));
-    PyDict_SetItemString(d,"CentreX", SWIG_FromInt((int)wxCentreX));
-    PyDict_SetItemString(d,"CentreY", SWIG_FromInt((int)wxCentreY));
-    PyDict_SetItemString(d,"Unconstrained", SWIG_FromInt((int)wxUnconstrained));
-    PyDict_SetItemString(d,"AsIs", SWIG_FromInt((int)wxAsIs));
-    PyDict_SetItemString(d,"PercentOf", SWIG_FromInt((int)wxPercentOf));
-    PyDict_SetItemString(d,"Above", SWIG_FromInt((int)wxAbove));
-    PyDict_SetItemString(d,"Below", SWIG_FromInt((int)wxBelow));
-    PyDict_SetItemString(d,"LeftOf", SWIG_FromInt((int)wxLeftOf));
-    PyDict_SetItemString(d,"RightOf", SWIG_FromInt((int)wxRightOf));
-    PyDict_SetItemString(d,"SameAs", SWIG_FromInt((int)wxSameAs));
-    PyDict_SetItemString(d,"Absolute", SWIG_FromInt((int)wxAbsolute));
+    PyDict_SetItemString(d,"Left", SWIG_From_int((int)wxLeft));
+    PyDict_SetItemString(d,"Top", SWIG_From_int((int)wxTop));
+    PyDict_SetItemString(d,"Right", SWIG_From_int((int)wxRight));
+    PyDict_SetItemString(d,"Bottom", SWIG_From_int((int)wxBottom));
+    PyDict_SetItemString(d,"Width", SWIG_From_int((int)wxWidth));
+    PyDict_SetItemString(d,"Height", SWIG_From_int((int)wxHeight));
+    PyDict_SetItemString(d,"Centre", SWIG_From_int((int)wxCentre));
+    PyDict_SetItemString(d,"Center", SWIG_From_int((int)wxCenter));
+    PyDict_SetItemString(d,"CentreX", SWIG_From_int((int)wxCentreX));
+    PyDict_SetItemString(d,"CentreY", SWIG_From_int((int)wxCentreY));
+    PyDict_SetItemString(d,"Unconstrained", SWIG_From_int((int)wxUnconstrained));
+    PyDict_SetItemString(d,"AsIs", SWIG_From_int((int)wxAsIs));
+    PyDict_SetItemString(d,"PercentOf", SWIG_From_int((int)wxPercentOf));
+    PyDict_SetItemString(d,"Above", SWIG_From_int((int)wxAbove));
+    PyDict_SetItemString(d,"Below", SWIG_From_int((int)wxBelow));
+    PyDict_SetItemString(d,"LeftOf", SWIG_From_int((int)wxLeftOf));
+    PyDict_SetItemString(d,"RightOf", SWIG_From_int((int)wxRightOf));
+    PyDict_SetItemString(d,"SameAs", SWIG_From_int((int)wxSameAs));
+    PyDict_SetItemString(d,"Absolute", SWIG_From_int((int)wxAbsolute));
     
     // Initialize threading, some globals and such
     __wxPyPreStart(d);

diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index af7167448c4f9c7f6ed8930974e966a70a17f302..61c27dce07c37b3350da99147178becdf457d42d 100644 (file)
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxPostScriptDC swig_types[0] 
@@ -273,47 +275,64 @@ static swig_type_info *swig_types[56];
 
 #define SWIG_name    "_gdi_"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -322,108 +341,224 @@ static swig_type_info *swig_types[56];
 
  static const wxString wxPyEmptyString(wxEmptyString); 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+#include <limits.h>
+
+
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
+    }
+    return 0;
+  }
+  return 1;
 }
 
 
+// See my_fragments.i
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+    }
     return 0;
+}
+
+
+#if INT_MAX != LONG_MAX
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{ 
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
   } else {
-    return 1;
+    PyErr_Clear();
   }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
+#else
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
+#endif
 
 
-#include <limits.h>
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
+{
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
+}
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
-                             unsigned long max_value) 
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  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);
-    }
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
-  return value;
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-    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);
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
         return 0;
     }
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+SWIGSTATICINLINE(int)
+  SWIG_CheckUnsignedLongInRange(unsigned long value,
+                               unsigned long max_value,
+                               const char *errmsg) 
 {
-  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");
+  if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' minimum %ld",
+                  value, errmsg, max_value);
     }
-    return i;
+    return 0;
   }
-}
+  return 1;
+ }
 
 
-SWIGSTATICINLINE(unsigned char)
-SWIG_AsUnsignedChar(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_char(PyObject *obj, unsigned char *val)
 { 
-  return swig_numeric_cast(unsigned char,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned char", UCHAR_MAX));
+  const char* errmsg = val ? "unsigned char" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, UCHAR_MAX,errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned char);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned char is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedChar(PyObject* obj)
+SWIGSTATICINLINE(unsigned char)
+SWIG_As_unsigned_SS_char(PyObject* obj)
 {
-  SWIG_AsUnsignedChar(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned char v;
+  if (!SWIG_AsVal_unsigned_SS_char(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned char));
   }
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIG_Check_unsigned_SS_char(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  return SWIG_AsVal_unsigned_SS_char(obj, (unsigned char*)0);
+}
+
+
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
+{
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 PyObject *wxColour_Get(wxColour *self){
@@ -446,79 +581,51 @@ unsigned long wxColour_GetRGB(wxColour *self){
         }
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+SWIG_As_int(PyObject* obj)
 {
-  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);
-    }
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
-  return value;
+  return v;
 }
 
-
-#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_Check_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
-  }
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -530,6 +637,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
+
 PyObject *wxPen_GetDashes(wxPen *self){
             wxDash* dashes;
             int count = self->GetDashes(&dashes);
@@ -565,25 +673,48 @@ void wxPen__SetDashes(wxPen *self,PyObject *_self,PyObject *pyDashes){
 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;  }
 
-SWIGSTATICINLINE(short)
-SWIG_AsShort(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_short(PyObject *obj, short *val)
 { 
-  return swig_numeric_cast(short,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "short", SHRT_MIN, SHRT_MAX));
+  const char* errmsg = val ? "short" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, SHRT_MIN, SHRT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, short);
+      return 1;
+    } else {
+      return 0;
+    }    
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a short is expected");
+  }
+  return 0;    
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckShort(PyObject* obj)
+SWIGSTATICINLINE(short)
+SWIG_As_short(PyObject* obj)
 {
-  SWIG_AsShort(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  short v;
+  if (!SWIG_AsVal_short(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(short));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_short(PyObject* obj)
+{
+  return SWIG_AsVal_short(obj, (short*)0);
 }
 
 
@@ -686,16 +817,26 @@ int wxIconLocation_GetIndex(wxIconLocation *self){
 
         }
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 wxCursor *new_wxCursor(wxString const *cursorName,long type,int hotSpotX,int hotSpotY){
@@ -802,31 +943,44 @@ wxColour wxDC_GetPixelPoint(wxDC *self,wxPoint const &pt){
             return col;
         }
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckDouble(PyObject* obj)
+SWIGSTATICINLINE(double)
+SWIG_As_double(PyObject* obj)
 {
-  SWIG_AsDouble(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(double));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
 }
 
 wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image,wxRect const &rect,int alignment,int indexAccel){
@@ -834,6 +988,7 @@ wxRect wxDC_DrawImageLabel(wxDC *self,wxString const &text,wxBitmap const &image
             self->DrawLabel(text, image, rect, alignment, indexAccel, &rv);
             return rv;
         }
+
 wxRect wxDC_GetClippingRect(wxDC *self){
             wxRect rect;
             self->GetClippingBox(rect);
@@ -844,6 +999,7 @@ wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){
             self->GetPartialTextExtents(text, widths);
             return widths;
         }
+
 void wxDC_SetLogicalOriginPoint(wxDC *self,wxPoint const &point){
             self->SetLogicalOrigin(point.x, point.y);
         }
@@ -899,7 +1055,7 @@ void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_GDIObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GDIObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGDIObject *result;
     char *kwnames[] = {
@@ -922,7 +1078,7 @@ static PyObject *_wrap_new_GDIObject(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_GDIObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_GDIObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGDIObject *arg1 = (wxGDIObject *) 0 ;
     PyObject * obj0 = 0 ;
@@ -947,7 +1103,7 @@ static PyObject *_wrap_delete_GDIObject(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GDIObject_GetVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGDIObject *arg1 = (wxGDIObject *) 0 ;
     bool result;
@@ -975,7 +1131,7 @@ static PyObject *_wrap_GDIObject_GetVisible(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GDIObject_SetVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GDIObject_SetVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGDIObject *arg1 = (wxGDIObject *) 0 ;
     bool arg2 ;
@@ -988,7 +1144,7 @@ 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 ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGDIObject,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1004,7 +1160,7 @@ static PyObject *_wrap_GDIObject_SetVisible(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GDIObject_IsNull(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGDIObject *arg1 = (wxGDIObject *) 0 ;
     bool result;
@@ -1032,14 +1188,14 @@ static PyObject *_wrap_GDIObject_IsNull(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * GDIObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GDIObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGDIObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Colour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     byte arg1 = (byte) 0 ;
     byte arg2 = (byte) 0 ;
@@ -1054,15 +1210,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) {
-        arg1 = (byte) SWIG_AsUnsignedChar(obj0); 
+        arg1 = (byte)SWIG_As_unsigned_SS_char(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (byte) SWIG_AsUnsignedChar(obj1); 
+        arg2 = (byte)SWIG_As_unsigned_SS_char(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (byte) SWIG_AsUnsignedChar(obj2); 
+        arg3 = (byte)SWIG_As_unsigned_SS_char(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1079,7 +1235,7 @@ static PyObject *_wrap_new_Colour(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NamedColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxColour *result;
@@ -1118,7 +1274,7 @@ static PyObject *_wrap_new_NamedColour(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ColourRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long arg1 ;
     wxColour *result;
@@ -1128,7 +1284,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;
-    arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1144,7 +1300,7 @@ static PyObject *_wrap_new_ColourRGB(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Colour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1169,7 +1325,7 @@ static PyObject *_wrap_delete_Colour(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_Red(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     byte result;
@@ -1188,14 +1344,14 @@ static PyObject *_wrap_Colour_Red(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_Green(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     byte result;
@@ -1214,14 +1370,14 @@ static PyObject *_wrap_Colour_Green(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_Blue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     byte result;
@@ -1240,14 +1396,14 @@ static PyObject *_wrap_Colour_Blue(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedChar((unsigned char)result);
+    resultobj = SWIG_From_unsigned_SS_char((unsigned char)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     bool result;
@@ -1275,7 +1431,7 @@ static PyObject *_wrap_Colour_Ok(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     byte arg2 ;
@@ -1292,11 +1448,11 @@ 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 ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColour,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (byte) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (byte)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (byte) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (byte)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (byte) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (byte)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1312,7 +1468,7 @@ static PyObject *_wrap_Colour_Set(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_SetRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     unsigned long arg2 ;
@@ -1325,7 +1481,7 @@ static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *k
     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); 
+    arg2 = (unsigned long)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1341,7 +1497,7 @@ static PyObject *_wrap_Colour_SetRGB(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Colour_SetFromName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_SetFromName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     wxString *arg2 = 0 ;
@@ -1382,7 +1538,7 @@ static PyObject *_wrap_Colour_SetFromName(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Colour_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_GetPixel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     long result;
@@ -1401,14 +1557,14 @@ static PyObject *_wrap_Colour_GetPixel(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     wxColour *arg2 = 0 ;
@@ -1443,7 +1599,7 @@ static PyObject *_wrap_Colour___eq__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     wxColour *arg2 = 0 ;
@@ -1478,7 +1634,7 @@ static PyObject *_wrap_Colour___ne__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     PyObject *result;
@@ -1504,7 +1660,7 @@ static PyObject *_wrap_Colour_Get(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Colour_GetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Colour_GetRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = (wxColour *) 0 ;
     unsigned long result;
@@ -1523,21 +1679,21 @@ static PyObject *_wrap_Colour_GetRGB(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * Colour_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Colour_swigregister(PyObject *, 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) {
+static PyObject *_wrap_new_Palette(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     unsigned char *arg2 = (unsigned char *) 0 ;
@@ -1553,7 +1709,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_Palette",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_unsigned_char,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1576,7 +1732,7 @@ static PyObject *_wrap_new_Palette(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_Palette(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Palette(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPalette *arg1 = (wxPalette *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1601,7 +1757,7 @@ static PyObject *_wrap_delete_Palette(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Palette_GetPixel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPalette *arg1 = (wxPalette *) 0 ;
     byte arg2 ;
@@ -1619,11 +1775,11 @@ 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 ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPalette,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (byte) SWIG_AsUnsignedChar(obj1); 
+    arg2 = (byte)SWIG_As_unsigned_SS_char(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (byte) SWIG_AsUnsignedChar(obj2); 
+    arg3 = (byte)SWIG_As_unsigned_SS_char(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (byte) SWIG_AsUnsignedChar(obj3); 
+    arg4 = (byte)SWIG_As_unsigned_SS_char(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1632,14 +1788,14 @@ static PyObject *_wrap_Palette_GetPixel(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Palette_GetRGB(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPalette *arg1 = (wxPalette *) 0 ;
     int arg2 ;
@@ -1648,21 +1804,24 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject *
     byte *arg5 = (byte *) 0 ;
     bool result;
     byte temp3 ;
+    int res3 = 0 ;
     byte temp4 ;
+    int res4 = 0 ;
     byte temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "pixel", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1674,25 +1833,19 @@ static PyObject *_wrap_Palette_GetRGB(PyObject *self, PyObject *args, PyObject *
     {
         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) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_byte, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_byte, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_unsigned_SS_char((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_byte, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Palette_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPalette *arg1 = (wxPalette *) 0 ;
     bool result;
@@ -1720,14 +1873,14 @@ static PyObject *_wrap_Palette_Ok(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject * Palette_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Palette_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPalette, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Pen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = 0 ;
     int arg2 = (int) 1 ;
@@ -1747,11 +1900,11 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs)
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1769,7 +1922,7 @@ static PyObject *_wrap_new_Pen(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_delete_Pen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Pen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1794,7 +1947,7 @@ static PyObject *_wrap_delete_Pen(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_GetCap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int result;
@@ -1813,14 +1966,14 @@ static PyObject *_wrap_Pen_GetCap(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Pen_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     wxColour result;
@@ -1850,7 +2003,7 @@ static PyObject *_wrap_Pen_GetColour(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_GetJoin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int result;
@@ -1869,14 +2022,14 @@ static PyObject *_wrap_Pen_GetJoin(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int result;
@@ -1895,14 +2048,14 @@ static PyObject *_wrap_Pen_GetStyle(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int result;
@@ -1921,14 +2074,14 @@ static PyObject *_wrap_Pen_GetWidth(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     bool result;
@@ -1956,7 +2109,7 @@ static PyObject *_wrap_Pen_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_SetCap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
@@ -1969,7 +2122,7 @@ static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwar
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1985,7 +2138,7 @@ static PyObject *_wrap_Pen_SetCap(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Pen_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2017,7 +2170,7 @@ static PyObject *_wrap_Pen_SetColour(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_SetJoin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
@@ -2030,7 +2183,7 @@ static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwa
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2046,7 +2199,7 @@ static PyObject *_wrap_Pen_SetJoin(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
@@ -2059,7 +2212,7 @@ static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kw
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2075,7 +2228,7 @@ static PyObject *_wrap_Pen_SetStyle(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
@@ -2088,7 +2241,7 @@ static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kw
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2104,7 +2257,7 @@ static PyObject *_wrap_Pen_SetWidth(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Pen_SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_SetDashes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     int arg2 ;
@@ -2143,7 +2296,7 @@ static PyObject *_wrap_Pen_SetDashes(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen_GetDashes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     PyObject *result;
@@ -2169,7 +2322,7 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Pen__SetDashes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen__SetDashes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2200,7 +2353,7 @@ static PyObject *_wrap_Pen__SetDashes(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -2232,7 +2385,7 @@ static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Pen___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPen *arg1 = (wxPen *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -2264,14 +2417,14 @@ static PyObject *_wrap_Pen___ne__(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject * Pen_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Pen_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPen, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Brush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour *arg1 = 0 ;
     int arg2 = (int) wxSOLID ;
@@ -2289,7 +2442,7 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg
         if ( ! wxColour_helper(obj0, &arg1)) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2307,7 +2460,7 @@ static PyObject *_wrap_new_Brush(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_Brush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Brush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2332,7 +2485,7 @@ static PyObject *_wrap_delete_Brush(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Brush_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2364,7 +2517,7 @@ static PyObject *_wrap_Brush_SetColour(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     int arg2 ;
@@ -2377,7 +2530,7 @@ static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject *
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2393,7 +2546,7 @@ static PyObject *_wrap_Brush_SetStyle(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Brush_SetStipple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_SetStipple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -2427,7 +2580,7 @@ static PyObject *_wrap_Brush_SetStipple(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Brush_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     wxColour result;
@@ -2457,7 +2610,7 @@ static PyObject *_wrap_Brush_GetColour(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     int result;
@@ -2476,14 +2629,14 @@ static PyObject *_wrap_Brush_GetStyle(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Brush_GetStipple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_GetStipple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     wxBitmap *result;
@@ -2509,7 +2662,7 @@ static PyObject *_wrap_Brush_GetStipple(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     bool result;
@@ -2537,7 +2690,7 @@ static PyObject *_wrap_Brush_Ok(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Brush_MacGetTheme(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_MacGetTheme(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     short result;
@@ -2556,14 +2709,14 @@ static PyObject *_wrap_Brush_MacGetTheme(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromShort((short)result);
+    resultobj = SWIG_From_short((short)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Brush_MacSetTheme(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Brush_MacSetTheme(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrush *arg1 = (wxBrush *) 0 ;
     short arg2 ;
@@ -2576,7 +2729,7 @@ static PyObject *_wrap_Brush_MacSetTheme(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Brush_MacSetTheme",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBrush,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (short) SWIG_AsShort(obj1); 
+    arg2 = (short)SWIG_As_short(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2592,14 +2745,14 @@ static PyObject *_wrap_Brush_MacSetTheme(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * Brush_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Brush_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBrush, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Bitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 = (int) wxBITMAP_TYPE_ANY ;
@@ -2618,7 +2771,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (wxBitmapType) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2644,7 +2797,7 @@ static PyObject *_wrap_new_Bitmap(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_Bitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Bitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2669,7 +2822,7 @@ static PyObject *_wrap_delete_Bitmap(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EmptyBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -2683,12 +2836,12 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_EmptyBitmap",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2706,7 +2859,7 @@ static PyObject *_wrap_new_EmptyBitmap(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_BitmapFromIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BitmapFromIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = 0 ;
     wxBitmap *result;
@@ -2738,7 +2891,7 @@ static PyObject *_wrap_new_BitmapFromIcon(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BitmapFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = 0 ;
     int arg2 = (int) -1 ;
@@ -2758,7 +2911,7 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj
         SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2776,7 +2929,7 @@ static PyObject *_wrap_new_BitmapFromImage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_BitmapFromXPMData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BitmapFromXPMData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     wxBitmap *result;
@@ -2802,7 +2955,7 @@ static PyObject *_wrap_new_BitmapFromXPMData(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BitmapFromBits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     int arg2 ;
@@ -2819,12 +2972,12 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:new_BitmapFromBits",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     arg1 = obj0;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2842,7 +2995,7 @@ static PyObject *_wrap_new_BitmapFromBits(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     bool result;
@@ -2870,7 +3023,7 @@ static PyObject *_wrap_Bitmap_Ok(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int result;
@@ -2889,14 +3042,14 @@ static PyObject *_wrap_Bitmap_GetWidth(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int result;
@@ -2915,14 +3068,14 @@ static PyObject *_wrap_Bitmap_GetHeight(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_GetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int result;
@@ -2941,14 +3094,14 @@ static PyObject *_wrap_Bitmap_GetDepth(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Bitmap_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxSize result;
@@ -2978,7 +3131,7 @@ static PyObject *_wrap_Bitmap_GetSize(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Bitmap_ConvertToImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_ConvertToImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     SwigValueWrapper< wxImage > result;
@@ -3008,7 +3161,7 @@ static PyObject *_wrap_Bitmap_ConvertToImage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Bitmap_GetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_GetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxMask *result;
@@ -3034,7 +3187,7 @@ static PyObject *_wrap_Bitmap_GetMask(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Bitmap_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SetMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxMask *arg2 = (wxMask *) 0 ;
@@ -3063,7 +3216,7 @@ static PyObject *_wrap_Bitmap_SetMask(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Bitmap_SetMaskColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SetMaskColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3095,7 +3248,7 @@ static PyObject *_wrap_Bitmap_SetMaskColour(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Bitmap_GetSubBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_GetSubBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxRect *arg2 = 0 ;
@@ -3132,7 +3285,7 @@ static PyObject *_wrap_Bitmap_GetSubBitmap(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SaveFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxString *arg2 = 0 ;
@@ -3156,7 +3309,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (wxBitmapType) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxPalette,
@@ -3186,7 +3339,7 @@ static PyObject *_wrap_Bitmap_SaveFile(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxString *arg2 = 0 ;
@@ -3208,7 +3361,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (wxBitmapType) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3234,7 +3387,7 @@ static PyObject *_wrap_Bitmap_LoadFile(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -3271,7 +3424,7 @@ static PyObject *_wrap_Bitmap_CopyFromIcon(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
@@ -3284,7 +3437,7 @@ static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3300,7 +3453,7 @@ static PyObject *_wrap_Bitmap_SetHeight(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
@@ -3313,7 +3466,7 @@ static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3329,7 +3482,7 @@ static PyObject *_wrap_Bitmap_SetWidth(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     int arg2 ;
@@ -3342,7 +3495,7 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3358,7 +3511,7 @@ static PyObject *_wrap_Bitmap_SetDepth(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Bitmap_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxSize *arg2 = 0 ;
@@ -3390,7 +3543,7 @@ static PyObject *_wrap_Bitmap_SetSize(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Bitmap___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxBitmap *arg2 = (wxBitmap *) 0 ;
@@ -3422,7 +3575,7 @@ static PyObject *_wrap_Bitmap___eq__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Bitmap___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bitmap___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = (wxBitmap *) 0 ;
     wxBitmap *arg2 = (wxBitmap *) 0 ;
@@ -3454,14 +3607,14 @@ static PyObject *_wrap_Bitmap___ne__(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Bitmap_swigregister(PyObject *, 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_new_Mask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxColour const &arg2_defvalue = wxNullColour ;
@@ -3503,14 +3656,14 @@ static PyObject *_wrap_new_Mask(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject * Mask_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Mask_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMask, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Icon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 ;
@@ -3532,14 +3685,14 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
         if (arg1 == NULL) SWIG_fail;
         temp1 = True;
     }
-    arg2 = (wxBitmapType) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3565,7 +3718,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_delete_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Icon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3590,7 +3743,7 @@ static PyObject *_wrap_delete_Icon(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_EmptyIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EmptyIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *result;
     char *kwnames[] = {
@@ -3613,7 +3766,7 @@ static PyObject *_wrap_new_EmptyIcon(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_IconFromLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconFromLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = 0 ;
     wxIcon *result;
@@ -3645,7 +3798,7 @@ static PyObject *_wrap_new_IconFromLocation(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_new_IconFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconFromBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxIcon *result;
@@ -3677,7 +3830,7 @@ static PyObject *_wrap_new_IconFromBitmap(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_IconFromXPMData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconFromXPMData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     wxIcon *result;
@@ -3703,7 +3856,7 @@ static PyObject *_wrap_new_IconFromXPMData(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     bool result;
@@ -3731,7 +3884,7 @@ static PyObject *_wrap_Icon_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int result;
@@ -3750,14 +3903,14 @@ static PyObject *_wrap_Icon_GetWidth(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int result;
@@ -3776,14 +3929,14 @@ static PyObject *_wrap_Icon_GetHeight(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_GetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int result;
@@ -3802,14 +3955,14 @@ static PyObject *_wrap_Icon_GetDepth(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
@@ -3822,7 +3975,7 @@ static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *k
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3838,7 +3991,7 @@ static PyObject *_wrap_Icon_SetWidth(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_SetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
@@ -3851,7 +4004,7 @@ static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject *
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3867,7 +4020,7 @@ static PyObject *_wrap_Icon_SetHeight(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_SetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     int arg2 ;
@@ -3880,7 +4033,7 @@ static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *k
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3896,7 +4049,7 @@ static PyObject *_wrap_Icon_SetDepth(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Icon_CopyFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Icon_CopyFromBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = (wxIcon *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -3930,14 +4083,14 @@ static PyObject *_wrap_Icon_CopyFromBitmap(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * Icon_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Icon_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIcon, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = (wxString *) &wxPyEmptyString ;
     int arg2 = (int) 0 ;
@@ -3958,7 +4111,7 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3983,7 +4136,7 @@ static PyObject *_wrap_new_IconLocation(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_IconLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_IconLocation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4008,7 +4161,7 @@ static PyObject *_wrap_delete_IconLocation(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconLocation_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     bool result;
@@ -4036,7 +4189,7 @@ static PyObject *_wrap_IconLocation_IsOk(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconLocation_SetFileName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     wxString *arg2 = 0 ;
@@ -4077,7 +4230,7 @@ static PyObject *_wrap_IconLocation_SetFileName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_IconLocation_GetFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconLocation_GetFileName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     wxString *result;
@@ -4112,7 +4265,7 @@ static PyObject *_wrap_IconLocation_GetFileName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconLocation_SetIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     int arg2 ;
@@ -4125,7 +4278,7 @@ static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyO
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4141,7 +4294,7 @@ static PyObject *_wrap_IconLocation_SetIndex(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconLocation_GetIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconLocation *arg1 = (wxIconLocation *) 0 ;
     int result;
@@ -4160,21 +4313,21 @@ static PyObject *_wrap_IconLocation_GetIndex(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * IconLocation_swigregister(PyObject *self, PyObject *args) {
+static PyObject * IconLocation_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIconLocation, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_IconBundle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconBundle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconBundle *result;
     char *kwnames[] = {
@@ -4196,7 +4349,7 @@ static PyObject *_wrap_new_IconBundle(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconBundleFromFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     long arg2 ;
@@ -4214,7 +4367,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py
         if (arg1 == NULL) SWIG_fail;
         temp1 = True;
     }
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4238,7 +4391,7 @@ static PyObject *_wrap_new_IconBundleFromFile(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_new_IconBundleFromIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_IconBundleFromIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIcon *arg1 = 0 ;
     wxIconBundle *result;
@@ -4269,7 +4422,7 @@ static PyObject *_wrap_new_IconBundleFromIcon(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_delete_IconBundle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_IconBundle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4294,7 +4447,7 @@ static PyObject *_wrap_delete_IconBundle(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_IconBundle_AddIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconBundle_AddIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -4328,7 +4481,7 @@ static PyObject *_wrap_IconBundle_AddIcon(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     wxString *arg2 = 0 ;
@@ -4349,7 +4502,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4373,7 +4526,7 @@ static PyObject *_wrap_IconBundle_AddIconFromFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_IconBundle_GetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IconBundle_GetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxIconBundle *arg1 = (wxIconBundle *) 0 ;
     wxSize *arg2 = 0 ;
@@ -4412,14 +4565,14 @@ static PyObject *_wrap_IconBundle_GetIcon(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * IconBundle_swigregister(PyObject *self, PyObject *args) {
+static PyObject * IconBundle_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxIconBundle, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = (wxString *) 0 ;
     long arg2 ;
@@ -4441,14 +4594,14 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar
         if (arg1 == NULL) SWIG_fail;
         temp1 = True;
     }
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4474,7 +4627,7 @@ static PyObject *_wrap_new_Cursor(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_Cursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Cursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCursor *arg1 = (wxCursor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4499,7 +4652,7 @@ static PyObject *_wrap_delete_Cursor(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StockCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxCursor *result;
@@ -4509,7 +4662,7 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_StockCursor",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -4526,7 +4679,7 @@ static PyObject *_wrap_new_StockCursor(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_CursorFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CursorFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImage *arg1 = 0 ;
     wxCursor *result;
@@ -4558,7 +4711,7 @@ static PyObject *_wrap_new_CursorFromImage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Cursor_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCursor *arg1 = (wxCursor *) 0 ;
     bool result;
@@ -4586,14 +4739,14 @@ static PyObject *_wrap_Cursor_Ok(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject * Cursor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Cursor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCursor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Region(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -4610,19 +4763,19 @@ static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_Region",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4640,7 +4793,7 @@ static PyObject *_wrap_new_Region(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RegionFromBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxRegion *result;
@@ -4672,7 +4825,7 @@ static PyObject *_wrap_new_RegionFromBitmap(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_new_RegionFromBitmapColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RegionFromBitmapColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxColour *arg2 = 0 ;
@@ -4699,7 +4852,7 @@ static PyObject *_wrap_new_RegionFromBitmapColour(PyObject *self, PyObject *args
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4717,7 +4870,7 @@ static PyObject *_wrap_new_RegionFromBitmapColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RegionFromPoints(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxPoint *arg2 = (wxPoint *) 0 ;
@@ -4735,7 +4888,7 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb
         if (arg2 == NULL) SWIG_fail;
     }
     if (obj1) {
-        arg3 = (int) SWIG_AsInt(obj1); 
+        arg3 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4759,7 +4912,7 @@ static PyObject *_wrap_new_RegionFromPoints(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_Region(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Region(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4784,7 +4937,7 @@ static PyObject *_wrap_delete_Region(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4809,7 +4962,7 @@ static PyObject *_wrap_Region_Clear(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_Contains(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     int arg2 ;
@@ -4825,9 +4978,9 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4836,14 +4989,14 @@ static PyObject *_wrap_Region_Contains(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_ContainsPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -4869,14 +5022,14 @@ static PyObject *_wrap_Region_ContainsPoint(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_ContainsRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRect *arg2 = 0 ;
@@ -4902,14 +5055,14 @@ static PyObject *_wrap_Region_ContainsRect(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_ContainsRectDim(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     int arg2 ;
@@ -4929,13 +5082,13 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4944,14 +5097,14 @@ static PyObject *_wrap_Region_ContainsRectDim(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_GetBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRect result;
@@ -4981,7 +5134,7 @@ static PyObject *_wrap_Region_GetBox(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_Intersect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     int arg2 ;
@@ -5001,13 +5154,13 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5025,7 +5178,7 @@ static PyObject *_wrap_Region_Intersect(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_IntersectRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5060,7 +5213,7 @@ static PyObject *_wrap_Region_IntersectRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_IntersectRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRegion *arg2 = 0 ;
@@ -5097,7 +5250,7 @@ static PyObject *_wrap_Region_IntersectRegion(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     bool result;
@@ -5125,7 +5278,7 @@ static PyObject *_wrap_Region_IsEmpty(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_Union(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     int arg2 ;
@@ -5145,13 +5298,13 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5169,7 +5322,7 @@ static PyObject *_wrap_Region_Union(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_UnionRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5204,7 +5357,7 @@ static PyObject *_wrap_Region_UnionRect(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_UnionRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRegion *arg2 = 0 ;
@@ -5241,7 +5394,7 @@ static PyObject *_wrap_Region_UnionRegion(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_Subtract(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     int arg2 ;
@@ -5261,13 +5414,13 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5285,7 +5438,7 @@ static PyObject *_wrap_Region_Subtract(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_SubtractRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5320,7 +5473,7 @@ static PyObject *_wrap_Region_SubtractRect(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_SubtractRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRegion *arg2 = 0 ;
@@ -5357,7 +5510,7 @@ static PyObject *_wrap_Region_SubtractRegion(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_Xor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     int arg2 ;
@@ -5377,13 +5530,13 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5401,7 +5554,7 @@ static PyObject *_wrap_Region_Xor(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_XorRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRect *arg2 = 0 ;
@@ -5436,7 +5589,7 @@ static PyObject *_wrap_Region_XorRect(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_XorRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxRegion *arg2 = 0 ;
@@ -5473,7 +5626,7 @@ static PyObject *_wrap_Region_XorRegion(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Region_ConvertToBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_ConvertToBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     SwigValueWrapper< wxBitmap > result;
@@ -5503,7 +5656,7 @@ static PyObject *_wrap_Region_ConvertToBitmap(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_UnionBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -5540,7 +5693,7 @@ static PyObject *_wrap_Region_UnionBitmap(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Region_UnionBitmapColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Region_UnionBitmapColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = (wxRegion *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -5571,7 +5724,7 @@ static PyObject *_wrap_Region_UnionBitmapColour(PyObject *self, PyObject *args,
         if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5590,14 +5743,14 @@ static PyObject *_wrap_Region_UnionBitmapColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * Region_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Region_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRegion, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_RegionIterator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_RegionIterator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegion *arg1 = 0 ;
     wxRegionIterator *result;
@@ -5629,7 +5782,7 @@ static PyObject *_wrap_new_RegionIterator(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_RegionIterator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_RegionIterator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5654,7 +5807,7 @@ static PyObject *_wrap_delete_RegionIterator(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     int result;
@@ -5673,14 +5826,14 @@ static PyObject *_wrap_RegionIterator_GetX(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     int result;
@@ -5699,14 +5852,14 @@ static PyObject *_wrap_RegionIterator_GetY(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetW(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     int result;
@@ -5725,14 +5878,14 @@ static PyObject *_wrap_RegionIterator_GetW(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     int result;
@@ -5751,14 +5904,14 @@ static PyObject *_wrap_RegionIterator_GetWidth(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     int result;
@@ -5777,14 +5930,14 @@ static PyObject *_wrap_RegionIterator_GetH(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     int result;
@@ -5803,14 +5956,14 @@ static PyObject *_wrap_RegionIterator_GetHeight(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegionIterator_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     wxRect result;
@@ -5840,7 +5993,7 @@ static PyObject *_wrap_RegionIterator_GetRect(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_HaveRects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     bool result;
@@ -5868,7 +6021,7 @@ static PyObject *_wrap_RegionIterator_HaveRects(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_RegionIterator_Reset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_Reset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5893,7 +6046,7 @@ static PyObject *_wrap_RegionIterator_Reset(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_RegionIterator_Next(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator_Next(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5918,7 +6071,7 @@ static PyObject *_wrap_RegionIterator_Next(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegionIterator___nonzero__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRegionIterator *arg1 = (wxRegionIterator *) 0 ;
     bool result;
@@ -5946,14 +6099,14 @@ static PyObject *_wrap_RegionIterator___nonzero__(PyObject *self, PyObject *args
 }
 
 
-static PyObject * RegionIterator_swigregister(PyObject *self, PyObject *args) {
+static PyObject * RegionIterator_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxRegionIterator, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_NativeFontInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NativeFontInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *result;
     char *kwnames[] = {
@@ -5975,7 +6128,7 @@ static PyObject *_wrap_new_NativeFontInfo(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_NativeFontInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_NativeFontInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6000,7 +6153,7 @@ static PyObject *_wrap_delete_NativeFontInfo(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_NativeFontInfo_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_Init(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6025,7 +6178,7 @@ static PyObject *_wrap_NativeFontInfo_Init(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_NativeFontInfo_InitFromFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_InitFromFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxFont *arg2 = 0 ;
@@ -6059,7 +6212,7 @@ static PyObject *_wrap_NativeFontInfo_InitFromFont(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int result;
@@ -6078,14 +6231,14 @@ static PyObject *_wrap_NativeFontInfo_GetPointSize(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int result;
@@ -6104,14 +6257,14 @@ static PyObject *_wrap_NativeFontInfo_GetStyle(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int result;
@@ -6130,14 +6283,14 @@ static PyObject *_wrap_NativeFontInfo_GetWeight(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     bool result;
@@ -6165,7 +6318,7 @@ static PyObject *_wrap_NativeFontInfo_GetUnderlined(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetFaceName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString result;
@@ -6197,7 +6350,7 @@ static PyObject *_wrap_NativeFontInfo_GetFaceName(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int result;
@@ -6216,14 +6369,14 @@ static PyObject *_wrap_NativeFontInfo_GetFamily(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int result;
@@ -6242,14 +6395,14 @@ static PyObject *_wrap_NativeFontInfo_GetEncoding(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
@@ -6262,7 +6415,7 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *arg
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6278,7 +6431,7 @@ static PyObject *_wrap_NativeFontInfo_SetPointSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
@@ -6291,7 +6444,7 @@ static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, P
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6307,7 +6460,7 @@ static PyObject *_wrap_NativeFontInfo_SetStyle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
@@ -6320,7 +6473,7 @@ static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args,
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6336,7 +6489,7 @@ static PyObject *_wrap_NativeFontInfo_SetWeight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     bool arg2 ;
@@ -6349,7 +6502,7 @@ static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *ar
     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 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6365,7 +6518,7 @@ static PyObject *_wrap_NativeFontInfo_SetUnderlined(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString arg2 ;
@@ -6398,7 +6551,7 @@ static PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
@@ -6411,7 +6564,7 @@ static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args,
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6427,7 +6580,7 @@ static PyObject *_wrap_NativeFontInfo_SetFamily(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     int arg2 ;
@@ -6440,7 +6593,7 @@ static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6456,7 +6609,7 @@ static PyObject *_wrap_NativeFontInfo_SetEncoding(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_FromString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
@@ -6500,7 +6653,7 @@ static PyObject *_wrap_NativeFontInfo_FromString(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_NativeFontInfo_ToString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_ToString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString result;
@@ -6532,7 +6685,7 @@ static PyObject *_wrap_NativeFontInfo_ToString(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_NativeFontInfo___str__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo___str__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString result;
@@ -6564,7 +6717,7 @@ static PyObject *_wrap_NativeFontInfo___str__(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString *arg2 = 0 ;
@@ -6608,7 +6761,7 @@ static PyObject *_wrap_NativeFontInfo_FromUserString(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_NativeFontInfo_ToUserString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeFontInfo_ToUserString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
     wxString result;
@@ -6640,14 +6793,14 @@ static PyObject *_wrap_NativeFontInfo_ToUserString(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * NativeFontInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NativeFontInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNativeFontInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString *arg2 = (wxString *) 0 ;
@@ -6683,7 +6836,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_set(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString *result;
@@ -6710,7 +6863,7 @@ static PyObject *_wrap_NativeEncodingInfo_facename_get(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     int arg2 ;
@@ -6723,7 +6876,7 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->encoding = (wxFontEncoding )arg2;
     
@@ -6734,7 +6887,7 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_set(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     int result;
@@ -6748,14 +6901,14 @@ static PyObject *_wrap_NativeEncodingInfo_encoding_get(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->encoding);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_NativeEncodingInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NativeEncodingInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *result;
     char *kwnames[] = {
@@ -6777,7 +6930,7 @@ static PyObject *_wrap_new_NativeEncodingInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_delete_NativeEncodingInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_NativeEncodingInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6802,7 +6955,7 @@ static PyObject *_wrap_delete_NativeEncodingInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString *arg2 = 0 ;
@@ -6846,7 +6999,7 @@ static PyObject *_wrap_NativeEncodingInfo_FromString(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_NativeEncodingInfo_ToString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NativeEncodingInfo_ToString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = (wxNativeEncodingInfo *) 0 ;
     wxString result;
@@ -6878,14 +7031,14 @@ static PyObject *_wrap_NativeEncodingInfo_ToString(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * NativeEncodingInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * NativeEncodingInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxNativeEncodingInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetNativeFontEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxNativeEncodingInfo *result;
@@ -6895,7 +7048,7 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetNativeFontEncoding",kwnames,&obj0)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6911,7 +7064,7 @@ static PyObject *_wrap_GetNativeFontEncoding(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TestFontEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeEncodingInfo *arg1 = 0 ;
     bool result;
@@ -6944,7 +7097,7 @@ static PyObject *_wrap_TestFontEncoding(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_FontMapper(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FontMapper(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *result;
     char *kwnames[] = {
@@ -6966,7 +7119,7 @@ static PyObject *_wrap_new_FontMapper(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_FontMapper(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FontMapper(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6991,7 +7144,7 @@ static PyObject *_wrap_delete_FontMapper(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_FontMapper_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *result;
     char *kwnames[] = {
@@ -7013,7 +7166,7 @@ static PyObject *_wrap_FontMapper_Get(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_FontMapper_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxFontMapper *result;
@@ -7039,7 +7192,7 @@ static PyObject *_wrap_FontMapper_Set(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
@@ -7062,7 +7215,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7072,7 +7225,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -7087,7 +7240,7 @@ static PyObject *_wrap_FontMapper_CharsetToEncoding(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     size_t result;
     char *kwnames[] = {
@@ -7102,14 +7255,14 @@ static PyObject *_wrap_FontMapper_GetSupportedEncodingsCount(PyObject *self, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     size_t arg1 ;
     int result;
@@ -7119,7 +7272,7 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncoding",kwnames,&obj0)) goto fail;
-    arg1 = (size_t) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (size_t)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7128,14 +7281,14 @@ static PyObject *_wrap_FontMapper_GetEncoding(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxString result;
@@ -7145,7 +7298,7 @@ static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingName",kwnames,&obj0)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7167,7 +7320,7 @@ static PyObject *_wrap_FontMapper_GetEncodingName(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxString result;
@@ -7177,7 +7330,7 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontMapper_GetEncodingDescription",kwnames,&obj0)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7199,7 +7352,7 @@ static PyObject *_wrap_FontMapper_GetEncodingDescription(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int result;
@@ -7222,7 +7375,7 @@ static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp1)
         delete arg1;
@@ -7237,7 +7390,7 @@ static PyObject *_wrap_FontMapper_GetEncodingFromName(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_FontMapper_SetConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_SetConfig(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -7266,7 +7419,7 @@ static PyObject *_wrap_FontMapper_SetConfig(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
@@ -7307,7 +7460,7 @@ static PyObject *_wrap_FontMapper_SetConfigPath(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FontMapper_GetDefaultConfigPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetDefaultConfigPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -7335,7 +7488,7 @@ static PyObject *_wrap_FontMapper_GetDefaultConfigPath(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     int arg2 ;
@@ -7355,7 +7508,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         {
@@ -7365,7 +7518,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar
         }
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7390,7 +7543,7 @@ static PyObject *_wrap_FontMapper_GetAltForEncoding(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     int arg2 ;
@@ -7408,7 +7561,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         {
@@ -7441,7 +7594,7 @@ static PyObject *_wrap_FontMapper_IsEncodingAvailable(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_FontMapper_SetDialogParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_SetDialogParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -7470,7 +7623,7 @@ static PyObject *_wrap_FontMapper_SetDialogParent(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontMapper *arg1 = (wxFontMapper *) 0 ;
     wxString *arg2 = 0 ;
@@ -7511,14 +7664,14 @@ static PyObject *_wrap_FontMapper_SetDialogTitle(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * FontMapper_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FontMapper_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFontMapper, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Font(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -7542,16 +7695,16 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
     };
     
     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); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (bool) SWIG_AsBool(obj4); 
+        arg5 = (bool)SWIG_As_bool(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -7562,7 +7715,7 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
         }
     }
     if (obj6) {
-        arg7 = (wxFontEncoding) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7588,7 +7741,7 @@ static PyObject *_wrap_new_Font(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_delete_Font(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Font(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7613,7 +7766,7 @@ static PyObject *_wrap_delete_Font(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_FontFromNativeInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FontFromNativeInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxNativeFontInfo *arg1 = 0 ;
     wxFont *result;
@@ -7645,7 +7798,7 @@ static PyObject *_wrap_new_FontFromNativeInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxFont *result;
@@ -7684,7 +7837,7 @@ static PyObject *_wrap_new_FontFromNativeInfoString(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Font2(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -7704,12 +7857,12 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_Font2",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (wxFontFamily) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -7720,7 +7873,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
         }
     }
     if (obj4) {
-        arg5 = (wxFontEncoding) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7746,7 +7899,7 @@ static PyObject *_wrap_new_Font2(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     bool result;
@@ -7774,7 +7927,7 @@ static PyObject *_wrap_Font_Ok(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -7806,7 +7959,7 @@ static PyObject *_wrap_Font___eq__(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -7838,7 +7991,7 @@ static PyObject *_wrap_Font___ne__(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int result;
@@ -7857,14 +8010,14 @@ static PyObject *_wrap_Font_GetPointSize(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetFamily(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int result;
@@ -7883,14 +8036,14 @@ static PyObject *_wrap_Font_GetFamily(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int result;
@@ -7909,14 +8062,14 @@ static PyObject *_wrap_Font_GetStyle(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetWeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int result;
@@ -7935,14 +8088,14 @@ static PyObject *_wrap_Font_GetWeight(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     bool result;
@@ -7970,7 +8123,7 @@ static PyObject *_wrap_Font_GetUnderlined(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Font_GetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetFaceName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString result;
@@ -8002,7 +8155,7 @@ static PyObject *_wrap_Font_GetFaceName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int result;
@@ -8021,14 +8174,14 @@ static PyObject *_wrap_Font_GetEncoding(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Font_GetNativeFontInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetNativeFontInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxNativeFontInfo *result;
@@ -8054,7 +8207,7 @@ static PyObject *_wrap_Font_GetNativeFontInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_IsFixedWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     bool result;
@@ -8082,7 +8235,7 @@ static PyObject *_wrap_Font_IsFixedWidth(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString result;
@@ -8114,7 +8267,7 @@ static PyObject *_wrap_Font_GetNativeFontInfoDesc(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString result;
@@ -8146,7 +8299,7 @@ static PyObject *_wrap_Font_GetNativeFontInfoUserDesc(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
@@ -8159,7 +8312,7 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObjec
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8175,7 +8328,7 @@ static PyObject *_wrap_Font_SetPointSize(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetFamily(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
@@ -8188,7 +8341,7 @@ static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject *
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8204,7 +8357,7 @@ static PyObject *_wrap_Font_SetFamily(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
@@ -8217,7 +8370,7 @@ static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *k
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8233,7 +8386,7 @@ static PyObject *_wrap_Font_SetStyle(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetWeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
@@ -8246,7 +8399,7 @@ static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject *
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8262,7 +8415,7 @@ static PyObject *_wrap_Font_SetWeight(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetFaceName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
@@ -8303,7 +8456,7 @@ static PyObject *_wrap_Font_SetFaceName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Font_SetUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     bool arg2 ;
@@ -8316,7 +8469,7 @@ 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 ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8332,7 +8485,7 @@ static PyObject *_wrap_Font_SetUnderlined(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     int arg2 ;
@@ -8345,7 +8498,7 @@ static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8361,7 +8514,7 @@ static PyObject *_wrap_Font_SetEncoding(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Font_SetNativeFontInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetNativeFontInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxNativeFontInfo *arg2 = 0 ;
@@ -8395,7 +8548,7 @@ static PyObject *_wrap_Font_SetNativeFontInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
@@ -8436,7 +8589,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString *arg2 = 0 ;
@@ -8477,7 +8630,7 @@ static PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_Font_GetFamilyString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetFamilyString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString result;
@@ -8509,7 +8662,7 @@ static PyObject *_wrap_Font_GetFamilyString(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Font_GetStyleString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetStyleString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString result;
@@ -8541,7 +8694,7 @@ static PyObject *_wrap_Font_GetStyleString(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Font_GetWeightString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetWeightString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxString result;
@@ -8573,7 +8726,7 @@ static PyObject *_wrap_Font_GetWeightString(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     bool arg2 = (bool) True ;
@@ -8587,7 +8740,7 @@ static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFont,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8604,7 +8757,7 @@ static PyObject *_wrap_Font_SetNoAntiAliasing(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     bool result;
@@ -8632,7 +8785,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -8648,14 +8801,14 @@ static PyObject *_wrap_Font_GetDefaultEncoding(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -8664,7 +8817,7 @@ static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Font_SetDefaultEncoding",kwnames,&obj0)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -8681,14 +8834,14 @@ static PyObject *_wrap_Font_SetDefaultEncoding(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * Font_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Font_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFont, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FontEnumerator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FontEnumerator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *result;
     char *kwnames[] = {
@@ -8711,7 +8864,7 @@ static PyObject *_wrap_new_FontEnumerator(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_FontEnumerator(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FontEnumerator(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8736,7 +8889,7 @@ static PyObject *_wrap_delete_FontEnumerator(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -8755,7 +8908,7 @@ static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
-    arg4 = (bool) SWIG_AsBool(obj3); 
+    arg4 = (bool)SWIG_As_bool(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8771,7 +8924,7 @@ static PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     int arg2 = (int) wxFONTENCODING_SYSTEM ;
@@ -8788,11 +8941,11 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFontEnumerator,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8811,7 +8964,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateFacenames(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -8858,7 +9011,7 @@ static PyObject *_wrap_FontEnumerator_EnumerateEncodings(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     PyObject *result;
@@ -8884,7 +9037,7 @@ static PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
     PyObject *result;
@@ -8910,14 +9063,14 @@ static PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * FontEnumerator_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FontEnumerator_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyFontEnumerator, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LanguageInfo_Language_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     int arg2 ;
@@ -8930,7 +9083,7 @@ static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args,
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->Language = arg2;
     
@@ -8941,7 +9094,7 @@ static PyObject *_wrap_LanguageInfo_Language_set(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LanguageInfo_Language_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     int result;
@@ -8955,14 +9108,14 @@ static PyObject *_wrap_LanguageInfo_Language_get(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->Language);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     wxString *arg2 = (wxString *) 0 ;
@@ -8998,7 +9151,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_set(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     wxString *result;
@@ -9025,7 +9178,7 @@ static PyObject *_wrap_LanguageInfo_CanonicalName_get(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LanguageInfo_Description_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     wxString *arg2 = (wxString *) 0 ;
@@ -9061,7 +9214,7 @@ static PyObject *_wrap_LanguageInfo_Description_set(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LanguageInfo_Description_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = (wxLanguageInfo *) 0 ;
     wxString *result;
@@ -9088,14 +9241,14 @@ static PyObject *_wrap_LanguageInfo_Description_get(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * LanguageInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LanguageInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLanguageInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Locale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) -1 ;
     int arg2 = (int) wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING ;
@@ -9108,11 +9261,11 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_Locale",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9129,7 +9282,7 @@ static PyObject *_wrap_new_Locale(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_Locale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Locale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9154,7 +9307,7 @@ static PyObject *_wrap_delete_Locale(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_Init1(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
@@ -9201,11 +9354,11 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (bool) SWIG_AsBool(obj4); 
+        arg5 = (bool)SWIG_As_bool(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (bool) SWIG_AsBool(obj5); 
+        arg6 = (bool)SWIG_As_bool(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9248,7 +9401,7 @@ static PyObject *_wrap_Locale_Init1(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_Init2(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     int arg2 = (int) wxLANGUAGE_DEFAULT ;
@@ -9265,11 +9418,11 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLocale,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9288,7 +9441,7 @@ static PyObject *_wrap_Locale_Init2(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -9303,14 +9456,14 @@ static PyObject *_wrap_Locale_GetSystemLanguage(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -9325,14 +9478,14 @@ static PyObject *_wrap_Locale_GetSystemEncoding(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Locale_GetSystemEncodingName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetSystemEncodingName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -9360,7 +9513,7 @@ static PyObject *_wrap_Locale_GetSystemEncodingName(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     bool result;
@@ -9388,7 +9541,7 @@ static PyObject *_wrap_Locale_IsOk(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Locale_GetLocale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetLocale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString result;
@@ -9420,7 +9573,7 @@ static PyObject *_wrap_Locale_GetLocale(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetLanguage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     int result;
@@ -9439,14 +9592,14 @@ static PyObject *_wrap_Locale_GetLanguage(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Locale_GetSysName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetSysName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString result;
@@ -9478,7 +9631,7 @@ static PyObject *_wrap_Locale_GetSysName(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Locale_GetCanonicalName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetCanonicalName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString result;
@@ -9510,7 +9663,7 @@ static PyObject *_wrap_Locale_GetCanonicalName(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -9547,7 +9700,7 @@ static PyObject *_wrap_Locale_AddCatalogLookupPathPrefix(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_AddCatalog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
@@ -9591,7 +9744,7 @@ static PyObject *_wrap_Locale_AddCatalog(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_IsLoaded(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
@@ -9635,7 +9788,7 @@ static PyObject *_wrap_Locale_IsLoaded(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxLanguageInfo *result;
@@ -9645,7 +9798,7 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageInfo",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9661,7 +9814,7 @@ static PyObject *_wrap_Locale_GetLanguageInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetLanguageName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxString result;
@@ -9671,7 +9824,7 @@ static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Locale_GetLanguageName",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9693,7 +9846,7 @@ static PyObject *_wrap_Locale_GetLanguageName(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxLanguageInfo *result;
@@ -9731,7 +9884,7 @@ static PyObject *_wrap_Locale_FindLanguageInfo(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Locale_AddLanguage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_AddLanguage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLanguageInfo *arg1 = 0 ;
     PyObject * obj0 = 0 ;
@@ -9761,7 +9914,7 @@ static PyObject *_wrap_Locale_AddLanguage(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *arg2 = 0 ;
@@ -9828,7 +9981,7 @@ static PyObject *_wrap_Locale_GetString(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Locale_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Locale_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *arg1 = (wxLocale *) 0 ;
     wxString *result;
@@ -9863,14 +10016,14 @@ static PyObject *_wrap_Locale_GetName(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * Locale_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Locale_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLocale, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_GetLocale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetLocale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLocale *result;
     char *kwnames[] = {
@@ -9892,7 +10045,7 @@ static PyObject *_wrap_GetLocale(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -9933,7 +10086,7 @@ static PyObject *_wrap_GetTranslation__SWIG_0(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -9956,7 +10109,7 @@ static PyObject *_wrap_GetTranslation__SWIG_1(PyObject *self, PyObject *args) {
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+    arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10022,7 +10175,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) {
                 _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]);
             }
             if (_v) {
-                _v = SWIG_CheckUnsignedLong(argv[2]);
+                _v = SWIG_Check_unsigned_SS_long(argv[2]);
                 if (_v) {
                     return _wrap_GetTranslation__SWIG_1(self,args);
                 }
@@ -10035,7 +10188,7 @@ static PyObject *_wrap_GetTranslation(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_new_EncodingConverter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_EncodingConverter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEncodingConverter *result;
     char *kwnames[] = {
@@ -10057,7 +10210,7 @@ static PyObject *_wrap_new_EncodingConverter(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_delete_EncodingConverter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_EncodingConverter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10082,7 +10235,7 @@ static PyObject *_wrap_delete_EncodingConverter(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EncodingConverter_Init(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ;
     int arg2 ;
@@ -10100,12 +10253,12 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (wxFontEncoding) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10124,7 +10277,7 @@ static PyObject *_wrap_EncodingConverter_Init(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EncodingConverter_Convert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEncodingConverter *arg1 = (wxEncodingConverter *) 0 ;
     wxString *arg2 = 0 ;
@@ -10172,7 +10325,7 @@ static PyObject *_wrap_EncodingConverter_Convert(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxPLATFORM_CURRENT ;
@@ -10184,10 +10337,10 @@ static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:EncodingConverter_GetPlatformEquivalents",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10211,7 +10364,7 @@ static PyObject *_wrap_EncodingConverter_GetPlatformEquivalents(PyObject *self,
 }
 
 
-static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxFontEncodingArray result;
@@ -10221,7 +10374,7 @@ static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EncodingConverter_GetAllEquivalents",kwnames,&obj0)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10244,7 +10397,7 @@ static PyObject *_wrap_EncodingConverter_GetAllEquivalents(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -10256,9 +10409,9 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:EncodingConverter_CanConvert",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (wxFontEncoding) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (wxFontEncoding) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10276,14 +10429,14 @@ static PyObject *_wrap_EncodingConverter_CanConvert(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * EncodingConverter_swigregister(PyObject *self, PyObject *args) {
+static PyObject * EncodingConverter_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEncodingConverter, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_delete_DC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10308,7 +10461,7 @@ static PyObject *_wrap_delete_DC(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_DC_BeginDrawing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_BeginDrawing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10333,7 +10486,7 @@ static PyObject *_wrap_DC_BeginDrawing(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_EndDrawing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10358,7 +10511,7 @@ static PyObject *_wrap_DC_EndDrawing(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_FloodFill(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10379,16 +10532,16 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:DC_FloodFill",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = &temp4;
         if ( ! wxColour_helper(obj3, &arg4)) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10407,7 +10560,7 @@ static PyObject *_wrap_DC_FloodFill(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_FloodFillPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_FloodFillPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10436,7 +10589,7 @@ static PyObject *_wrap_DC_FloodFillPoint(PyObject *self, PyObject *args, PyObjec
         if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10455,7 +10608,7 @@ static PyObject *_wrap_DC_FloodFillPoint(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetPixel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10471,9 +10624,9 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_GetPixel",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10493,7 +10646,7 @@ static PyObject *_wrap_DC_GetPixel(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_GetPixelPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetPixelPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10530,7 +10683,7 @@ static PyObject *_wrap_DC_GetPixelPoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10549,13 +10702,13 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawLine",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10571,7 +10724,7 @@ static PyObject *_wrap_DC_DrawLine(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_DrawLinePoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawLinePoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10610,7 +10763,7 @@ static PyObject *_wrap_DC_DrawLinePoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_CrossHair(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10625,9 +10778,9 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_CrossHair",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10643,7 +10796,7 @@ static PyObject *_wrap_DC_CrossHair(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_CrossHairPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_CrossHairPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10675,7 +10828,7 @@ static PyObject *_wrap_DC_CrossHairPoint(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10698,17 +10851,17 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawArc",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (int) SWIG_AsInt(obj5); 
+    arg6 = (int)SWIG_As_int(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg7 = (int) SWIG_AsInt(obj6); 
+    arg7 = (int)SWIG_As_int(obj6); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10724,7 +10877,7 @@ static PyObject *_wrap_DC_DrawArc(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_DC_DrawArcPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawArcPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10770,7 +10923,7 @@ static PyObject *_wrap_DC_DrawArcPoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawCheckMark(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10789,13 +10942,13 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawCheckMark",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10811,7 +10964,7 @@ static PyObject *_wrap_DC_DrawCheckMark(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawCheckMarkRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawCheckMarkRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRect *arg2 = 0 ;
@@ -10843,7 +10996,7 @@ static PyObject *_wrap_DC_DrawCheckMarkRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawEllipticArc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10866,17 +11019,17 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DC_DrawEllipticArc",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg7 = (double) SWIG_AsDouble(obj6); 
+    arg7 = (double)SWIG_As_double(obj6); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10892,7 +11045,7 @@ static PyObject *_wrap_DC_DrawEllipticArc(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_DrawEllipticArcPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawEllipticArcPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10921,9 +11074,9 @@ static PyObject *_wrap_DC_DrawEllipticArcPointSize(PyObject *self, PyObject *arg
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10939,7 +11092,7 @@ static PyObject *_wrap_DC_DrawEllipticArcPointSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -10954,9 +11107,9 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_DrawPoint",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10972,7 +11125,7 @@ static PyObject *_wrap_DC_DrawPoint(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_DrawPointPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawPointPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11004,7 +11157,7 @@ static PyObject *_wrap_DC_DrawPointPoint(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -11023,13 +11176,13 @@ static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawRectangle",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11045,7 +11198,7 @@ static PyObject *_wrap_DC_DrawRectangle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRectangleRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRect *arg2 = 0 ;
@@ -11077,7 +11230,7 @@ static PyObject *_wrap_DC_DrawRectangleRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_DrawRectanglePointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRectanglePointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11116,7 +11269,7 @@ static PyObject *_wrap_DC_DrawRectanglePointSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -11137,15 +11290,15 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DC_DrawRoundedRectangle",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (double) SWIG_AsDouble(obj5); 
+    arg6 = (double)SWIG_As_double(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11161,7 +11314,7 @@ static PyObject *_wrap_DC_DrawRoundedRectangle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRect *arg2 = 0 ;
@@ -11181,7 +11334,7 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg
         arg2 = &temp2;
         if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11197,7 +11350,7 @@ static PyObject *_wrap_DC_DrawRoundedRectangleRect(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_DC_DrawRoundedRectanglePointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRoundedRectanglePointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11224,7 +11377,7 @@ static PyObject *_wrap_DC_DrawRoundedRectanglePointSize(PyObject *self, PyObject
         arg3 = &temp3;
         if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11240,7 +11393,7 @@ static PyObject *_wrap_DC_DrawRoundedRectanglePointSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawCircle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -11257,11 +11410,11 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DC_DrawCircle",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11277,7 +11430,7 @@ static PyObject *_wrap_DC_DrawCircle(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DC_DrawCirclePoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawCirclePoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11297,7 +11450,7 @@ static PyObject *_wrap_DC_DrawCirclePoint(PyObject *self, PyObject *args, PyObje
         arg2 = &temp2;
         if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11313,7 +11466,7 @@ static PyObject *_wrap_DC_DrawCirclePoint(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawEllipse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -11332,13 +11485,13 @@ static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_DrawEllipse",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11354,7 +11507,7 @@ static PyObject *_wrap_DC_DrawEllipse(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DC_DrawEllipseRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawEllipseRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRect *arg2 = 0 ;
@@ -11386,7 +11539,7 @@ static PyObject *_wrap_DC_DrawEllipseRect(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_DrawEllipsePointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawEllipsePointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11425,7 +11578,7 @@ static PyObject *_wrap_DC_DrawEllipsePointSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -11449,9 +11602,9 @@ static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwa
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11467,7 +11620,7 @@ static PyObject *_wrap_DC_DrawIcon(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_DrawIconPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawIconPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -11508,7 +11661,7 @@ static PyObject *_wrap_DC_DrawIconPoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -11534,12 +11687,12 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (bool) SWIG_AsBool(obj4); 
+        arg5 = (bool)SWIG_As_bool(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11556,7 +11709,7 @@ static PyObject *_wrap_DC_DrawBitmap(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DC_DrawBitmapPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawBitmapPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -11586,7 +11739,7 @@ static PyObject *_wrap_DC_DrawBitmapPoint(PyObject *self, PyObject *args, PyObje
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11603,7 +11756,7 @@ static PyObject *_wrap_DC_DrawBitmapPoint(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -11626,9 +11779,9 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11652,7 +11805,7 @@ static PyObject *_wrap_DC_DrawText(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_DrawTextPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawTextPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -11700,7 +11853,7 @@ static PyObject *_wrap_DC_DrawTextPoint(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRotatedText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -11725,11 +11878,11 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (double) SWIG_AsDouble(obj4); 
+    arg5 = (double)SWIG_As_double(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11753,7 +11906,7 @@ static PyObject *_wrap_DC_DrawRotatedText(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -11781,7 +11934,7 @@ static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *self, PyObject *args, P
         arg3 = &temp3;
         if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
     }
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11805,7 +11958,7 @@ static PyObject *_wrap_DC_DrawRotatedTextPoint(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_Blit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -11839,34 +11992,34 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO|OOOO:DC_Blit",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(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); 
+    arg7 = (int)SWIG_As_int(obj6); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg8 = (int) SWIG_AsInt(obj7); 
+    arg8 = (int)SWIG_As_int(obj7); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj8) {
-        arg9 = (int) SWIG_AsInt(obj8); 
+        arg9 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
-        arg10 = (bool) SWIG_AsBool(obj9); 
+        arg10 = (bool)SWIG_As_bool(obj9); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj10) {
-        arg11 = (int) SWIG_AsInt(obj10); 
+        arg11 = (int)SWIG_As_int(obj10); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj11) {
-        arg12 = (int) SWIG_AsInt(obj11); 
+        arg12 = (int)SWIG_As_int(obj11); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11885,7 +12038,7 @@ static PyObject *_wrap_DC_Blit(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_DC_BlitPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_BlitPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11931,11 +12084,11 @@ static PyObject *_wrap_DC_BlitPointSize(PyObject *self, PyObject *args, PyObject
         if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -11960,7 +12113,7 @@ static PyObject *_wrap_DC_BlitPointSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -11979,13 +12132,13 @@ static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DC_SetClippingRegion",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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12001,7 +12154,7 @@ static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_SetClippingRegionPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRegionPointSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -12040,7 +12193,7 @@ static PyObject *_wrap_DC_SetClippingRegionPointSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRegion *arg2 = 0 ;
@@ -12074,7 +12227,7 @@ static PyObject *_wrap_DC_SetClippingRegionAsRegion(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRect *arg2 = 0 ;
@@ -12106,7 +12259,7 @@ static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -12129,11 +12282,11 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw
         if (arg3 == NULL) SWIG_fail;
     }
     if (obj2) {
-        arg4 = (int) SWIG_AsInt(obj2); 
+        arg4 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg5 = (int) SWIG_AsInt(obj3); 
+        arg5 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12156,7 +12309,7 @@ static PyObject *_wrap_DC_DrawLines(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawPolygon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -12181,15 +12334,15 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject *
         if (arg3 == NULL) SWIG_fail;
     }
     if (obj2) {
-        arg4 = (int) SWIG_AsInt(obj2); 
+        arg4 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg5 = (int) SWIG_AsInt(obj3); 
+        arg5 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg6 = (int) SWIG_AsInt(obj4); 
+        arg6 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12212,7 +12365,7 @@ static PyObject *_wrap_DC_DrawPolygon(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -12243,11 +12396,11 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw
         if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12272,7 +12425,7 @@ static PyObject *_wrap_DC_DrawLabel(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawImageLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -12313,11 +12466,11 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec
         if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12346,7 +12499,7 @@ static PyObject *_wrap_DC_DrawImageLabel(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DC_DrawSpline(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DrawSpline(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -12384,7 +12537,7 @@ static PyObject *_wrap_DC_DrawSpline(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DC_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12409,7 +12562,7 @@ static PyObject *_wrap_DC_Clear(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_StartDoc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -12453,7 +12606,7 @@ static PyObject *_wrap_DC_StartDoc(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_EndDoc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_EndDoc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12478,7 +12631,7 @@ static PyObject *_wrap_DC_EndDoc(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_DC_StartPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_StartPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12503,7 +12656,7 @@ static PyObject *_wrap_DC_StartPage(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_EndPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_EndPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12528,7 +12681,7 @@ static PyObject *_wrap_DC_EndPage(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_DC_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxFont *arg2 = 0 ;
@@ -12562,7 +12715,7 @@ static PyObject *_wrap_DC_SetFont(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_DC_SetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPen *arg2 = 0 ;
@@ -12596,7 +12749,7 @@ static PyObject *_wrap_DC_SetPen(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_DC_SetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBrush *arg2 = 0 ;
@@ -12630,7 +12783,7 @@ static PyObject *_wrap_DC_SetBrush(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_SetBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBrush *arg2 = 0 ;
@@ -12664,7 +12817,7 @@ static PyObject *_wrap_DC_SetBackground(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -12677,7 +12830,7 @@ static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyOb
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12693,7 +12846,7 @@ static PyObject *_wrap_DC_SetBackgroundMode(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetPalette(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPalette *arg2 = 0 ;
@@ -12727,7 +12880,7 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12752,7 +12905,7 @@ static PyObject *_wrap_DC_DestroyClippingRegion(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetClippingBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -12760,18 +12913,22 @@ static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObjec
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     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;
@@ -12783,29 +12940,21 @@ static PyObject *_wrap_DC_GetClippingBox(PyObject *self, PyObject *args, PyObjec
         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);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetClippingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxRect result;
@@ -12835,7 +12984,7 @@ static PyObject *_wrap_DC_GetClippingRect(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetCharHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -12854,14 +13003,14 @@ static PyObject *_wrap_DC_GetCharHeight(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetCharWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -12880,14 +13029,14 @@ static PyObject *_wrap_DC_GetCharWidth(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -12895,15 +13044,17 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
     int *arg4 = (int *) 0 ;
     bool temp2 = False ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "string", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     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;
@@ -12920,14 +13071,10 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -12942,7 +13089,7 @@ static PyObject *_wrap_DC_GetTextExtent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetFullTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -12953,9 +13100,13 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
     wxFont *arg7 = (wxFont *) NULL ;
     bool temp2 = False ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     int temp6 ;
+    int res6 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12963,10 +13114,10 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
         (char *) "self",(char *) "string",(char *) "font", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
-    arg6 = &temp6;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
+    arg6 = &temp6; res6 = SWIG_NEWOBJ;
     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;
@@ -12987,22 +13138,14 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg6));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res6 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg6)) : SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -13017,7 +13160,7 @@ static PyObject *_wrap_DC_GetFullTextExtent(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -13027,8 +13170,11 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
     wxFont *arg6 = (wxFont *) NULL ;
     bool temp2 = False ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -13036,9 +13182,9 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
         (char *) "self",(char *) "text",(char *) "font", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     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;
@@ -13059,18 +13205,12 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     {
         if (temp2)
         delete arg2;
@@ -13085,7 +13225,7 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxString *arg2 = 0 ;
@@ -13135,7 +13275,7 @@ static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize result;
@@ -13165,20 +13305,22 @@ static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     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;
@@ -13190,21 +13332,17 @@ static PyObject *_wrap_DC_GetSizeTuple(PyObject *self, PyObject *args, PyObject
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetSizeMM(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize result;
@@ -13234,20 +13372,22 @@ static PyObject *_wrap_DC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DC_GetSizeMMTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetSizeMMTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     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;
@@ -13259,21 +13399,17 @@ static PyObject *_wrap_DC_GetSizeMMTuple(PyObject *self, PyObject *args, PyObjec
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13287,7 +13423,7 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13296,14 +13432,14 @@ static PyObject *_wrap_DC_DeviceToLogicalX(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13317,7 +13453,7 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13326,14 +13462,14 @@ static PyObject *_wrap_DC_DeviceToLogicalY(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13347,7 +13483,7 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13356,14 +13492,14 @@ static PyObject *_wrap_DC_DeviceToLogicalXRel(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13377,7 +13513,7 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13386,14 +13522,14 @@ static PyObject *_wrap_DC_DeviceToLogicalYRel(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13407,7 +13543,7 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13416,14 +13552,14 @@ static PyObject *_wrap_DC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13437,7 +13573,7 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13446,14 +13582,14 @@ static PyObject *_wrap_DC_LogicalToDeviceY(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13467,7 +13603,7 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13476,14 +13612,14 @@ static PyObject *_wrap_DC_LogicalToDeviceXRel(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13497,7 +13633,7 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13506,14 +13642,14 @@ static PyObject *_wrap_DC_LogicalToDeviceYRel(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_CanDrawBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     bool result;
@@ -13541,7 +13677,7 @@ static PyObject *_wrap_DC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_CanGetTextExtent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     bool result;
@@ -13569,7 +13705,7 @@ static PyObject *_wrap_DC_CanGetTextExtent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -13588,14 +13724,14 @@ static PyObject *_wrap_DC_GetDepth(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetPPI(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetPPI(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize result;
@@ -13625,7 +13761,7 @@ static PyObject *_wrap_DC_GetPPI(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     bool result;
@@ -13653,7 +13789,7 @@ static PyObject *_wrap_DC_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetBackgroundMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -13672,14 +13808,14 @@ static PyObject *_wrap_DC_GetBackgroundMode(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBrush *result;
@@ -13711,7 +13847,7 @@ static PyObject *_wrap_DC_GetBackground(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_GetBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBrush *result;
@@ -13743,7 +13879,7 @@ static PyObject *_wrap_DC_GetBrush(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_DC_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxFont *result;
@@ -13775,7 +13911,7 @@ static PyObject *_wrap_DC_GetFont(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_DC_GetPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPen *result;
@@ -13807,7 +13943,7 @@ static PyObject *_wrap_DC_GetPen(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_DC_GetTextBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetTextBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxColour *result;
@@ -13836,7 +13972,7 @@ static PyObject *_wrap_DC_GetTextBackground(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_GetTextForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetTextForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxColour *result;
@@ -13865,7 +14001,7 @@ static PyObject *_wrap_DC_GetTextForeground(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_SetTextForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetTextForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxColour *arg2 = 0 ;
@@ -13897,7 +14033,7 @@ static PyObject *_wrap_DC_SetTextForeground(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_SetTextBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetTextBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxColour *arg2 = 0 ;
@@ -13929,7 +14065,7 @@ static PyObject *_wrap_DC_SetTextBackground(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetMapMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -13948,14 +14084,14 @@ static PyObject *_wrap_DC_GetMapMode(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetMapMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -13968,7 +14104,7 @@ static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *k
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13984,20 +14120,22 @@ static PyObject *_wrap_DC_SetMapMode(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DC_GetUserScale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetUserScale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     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;
@@ -14009,21 +14147,17 @@ static PyObject *_wrap_DC_GetUserScale(PyObject *self, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetUserScale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     double arg2 ;
@@ -14038,9 +14172,9 @@ static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14056,20 +14190,22 @@ static PyObject *_wrap_DC_SetUserScale(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC_GetLogicalScale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetLogicalScale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     double *arg2 = (double *) 0 ;
     double *arg3 = (double *) 0 ;
     double temp2 ;
+    int res2 = 0 ;
     double temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     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;
@@ -14081,21 +14217,17 @@ static PyObject *_wrap_DC_GetLogicalScale(PyObject *self, PyObject *args, PyObje
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyFloat_FromDouble((double) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_double((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetLogicalScale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     double arg2 ;
@@ -14110,9 +14242,9 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje
     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); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14128,7 +14260,7 @@ static PyObject *_wrap_DC_SetLogicalScale(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint result;
@@ -14158,20 +14290,22 @@ static PyObject *_wrap_DC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     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;
@@ -14183,21 +14317,17 @@ static PyObject *_wrap_DC_GetLogicalOriginTuple(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -14212,9 +14342,9 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14230,7 +14360,7 @@ static PyObject *_wrap_DC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DC_SetLogicalOriginPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetLogicalOriginPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14262,7 +14392,7 @@ static PyObject *_wrap_DC_SetLogicalOriginPoint(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint result;
@@ -14292,20 +14422,22 @@ static PyObject *_wrap_DC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     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;
@@ -14317,21 +14449,17 @@ static PyObject *_wrap_DC_GetDeviceOriginTuple(PyObject *self, PyObject *args, P
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -14346,9 +14474,9 @@ static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObje
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14364,7 +14492,7 @@ static PyObject *_wrap_DC_SetDeviceOrigin(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14396,7 +14524,7 @@ static PyObject *_wrap_DC_SetDeviceOriginPoint(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetAxisOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     bool arg2 ;
@@ -14411,9 +14539,9 @@ 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 ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14429,7 +14557,7 @@ static PyObject *_wrap_DC_SetAxisOrientation(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetLogicalFunction(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -14448,14 +14576,14 @@ static PyObject *_wrap_DC_GetLogicalFunction(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetLogicalFunction(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -14468,7 +14596,7 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyO
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14484,7 +14612,7 @@ static PyObject *_wrap_DC_SetLogicalFunction(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DC_SetOptimization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_SetOptimization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     bool arg2 ;
@@ -14497,7 +14625,7 @@ 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 ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDC,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14513,7 +14641,7 @@ static PyObject *_wrap_DC_SetOptimization(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetOptimization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     bool result;
@@ -14541,7 +14669,7 @@ static PyObject *_wrap_DC_GetOptimization(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_CalcBoundingBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int arg2 ;
@@ -14556,9 +14684,9 @@ static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObje
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14574,7 +14702,7 @@ static PyObject *_wrap_DC_CalcBoundingBox(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DC_CalcBoundingBoxPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_CalcBoundingBoxPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -14606,7 +14734,7 @@ static PyObject *_wrap_DC_CalcBoundingBoxPoint(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_ResetBoundingBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14631,7 +14759,7 @@ static PyObject *_wrap_DC_ResetBoundingBox(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_MinX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -14650,14 +14778,14 @@ static PyObject *_wrap_DC_MinX(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_MaxX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -14676,14 +14804,14 @@ static PyObject *_wrap_DC_MaxX(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_MinY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -14702,14 +14830,14 @@ static PyObject *_wrap_DC_MinY(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_MaxY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int result;
@@ -14728,14 +14856,14 @@ static PyObject *_wrap_DC_MaxY(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC_GetBoundingBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC_GetBoundingBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -14743,18 +14871,22 @@ static PyObject *_wrap_DC_GetBoundingBox(PyObject *self, PyObject *args, PyObjec
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     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;
@@ -14766,29 +14898,21 @@ static PyObject *_wrap_DC_GetBoundingBox(PyObject *self, PyObject *args, PyObjec
         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);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DC__DrawPointList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC__DrawPointList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14823,7 +14947,7 @@ static PyObject *_wrap_DC__DrawPointList(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DC__DrawLineList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC__DrawLineList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14858,7 +14982,7 @@ static PyObject *_wrap_DC__DrawLineList(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DC__DrawRectangleList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC__DrawRectangleList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14893,7 +15017,7 @@ static PyObject *_wrap_DC__DrawRectangleList(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DC__DrawEllipseList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC__DrawEllipseList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14928,7 +15052,7 @@ static PyObject *_wrap_DC__DrawEllipseList(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DC__DrawPolygonList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC__DrawPolygonList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14963,7 +15087,7 @@ static PyObject *_wrap_DC__DrawPolygonList(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DC__DrawTextList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DC__DrawTextList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -15001,14 +15125,14 @@ static PyObject *_wrap_DC__DrawTextList(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * DC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MemoryDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MemoryDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryDC *result;
     char *kwnames[] = {
@@ -15031,7 +15155,7 @@ static PyObject *_wrap_new_MemoryDC(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_MemoryDCFromDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MemoryDCFromDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxMemoryDC *result;
@@ -15058,7 +15182,7 @@ static PyObject *_wrap_new_MemoryDCFromDC(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_MemoryDC_SelectObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MemoryDC_SelectObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMemoryDC *arg1 = (wxMemoryDC *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -15092,14 +15216,14 @@ static PyObject *_wrap_MemoryDC_SelectObject(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * MemoryDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MemoryDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMemoryDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -15132,7 +15256,7 @@ static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDC *arg1 = (wxDC *) 0 ;
     wxSize *arg2 = 0 ;
@@ -15224,7 +15348,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_delete_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_BufferedDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15249,7 +15373,7 @@ static PyObject *_wrap_delete_BufferedDC(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BufferedDC_UnMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBufferedDC *arg1 = (wxBufferedDC *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15274,14 +15398,14 @@ static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * BufferedDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BufferedDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBufferedDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BufferedPaintDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxBitmap const &arg2_defvalue = wxNullBitmap ;
@@ -15320,14 +15444,14 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * BufferedPaintDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BufferedPaintDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBufferedPaintDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ScreenDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScreenDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScreenDC *result;
     char *kwnames[] = {
@@ -15350,7 +15474,7 @@ static PyObject *_wrap_new_ScreenDC(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScreenDC *arg1 = (wxScreenDC *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -15382,7 +15506,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScreenDC *arg1 = (wxScreenDC *) 0 ;
     wxRect *arg2 = (wxRect *) NULL ;
@@ -15416,7 +15540,7 @@ static PyObject *_wrap_ScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScreenDC *arg1 = (wxScreenDC *) 0 ;
     bool result;
@@ -15444,14 +15568,14 @@ static PyObject *_wrap_ScreenDC_EndDrawingOnTop(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * ScreenDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ScreenDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScreenDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ClientDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ClientDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxClientDC *result;
@@ -15478,14 +15602,14 @@ static PyObject *_wrap_new_ClientDC(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * ClientDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ClientDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxClientDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PaintDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PaintDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPaintDC *result;
@@ -15512,14 +15636,14 @@ static PyObject *_wrap_new_PaintDC(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject * PaintDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PaintDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPaintDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_WindowDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WindowDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindowDC *result;
@@ -15546,14 +15670,14 @@ static PyObject *_wrap_new_WindowDC(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * WindowDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WindowDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindowDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MirrorDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDC *arg1 = 0 ;
     bool arg2 ;
@@ -15572,7 +15696,7 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -15589,14 +15713,14 @@ static PyObject *_wrap_new_MirrorDC(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject * MirrorDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MirrorDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMirrorDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PostScriptDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PostScriptDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = 0 ;
     wxPostScriptDC *result;
@@ -15628,7 +15752,7 @@ static PyObject *_wrap_new_PostScriptDC(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPostScriptDC *arg1 = (wxPostScriptDC *) 0 ;
     wxPrintData *result;
@@ -15657,7 +15781,7 @@ static PyObject *_wrap_PostScriptDC_GetPrintData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPostScriptDC *arg1 = (wxPostScriptDC *) 0 ;
     wxPrintData *arg2 = 0 ;
@@ -15691,7 +15815,7 @@ static PyObject *_wrap_PostScriptDC_SetPrintData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -15700,7 +15824,7 @@ static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PostScriptDC_SetResolution",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15716,7 +15840,7 @@ static PyObject *_wrap_PostScriptDC_SetResolution(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -15731,21 +15855,21 @@ static PyObject *_wrap_PostScriptDC_GetResolution(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PostScriptDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PostScriptDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPostScriptDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -15787,7 +15911,7 @@ static PyObject *_wrap_new_MetaFile(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_MetaFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_MetaFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFile *arg1 = (wxMetaFile *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15812,7 +15936,7 @@ static PyObject *_wrap_delete_MetaFile(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MetaFile_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetaFile_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFile *arg1 = (wxMetaFile *) 0 ;
     bool result;
@@ -15840,7 +15964,7 @@ static PyObject *_wrap_MetaFile_Ok(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetaFile_SetClipboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFile *arg1 = (wxMetaFile *) 0 ;
     int arg2 = (int) 0 ;
@@ -15857,11 +15981,11 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMetaFile,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15880,7 +16004,7 @@ static PyObject *_wrap_MetaFile_SetClipboard(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MetaFile_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetaFile_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFile *arg1 = (wxMetaFile *) 0 ;
     wxSize result;
@@ -15910,7 +16034,7 @@ static PyObject *_wrap_MetaFile_GetSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MetaFile_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetaFile_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFile *arg1 = (wxMetaFile *) 0 ;
     int result;
@@ -15929,14 +16053,14 @@ static PyObject *_wrap_MetaFile_GetWidth(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_MetaFile_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetaFile_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFile *arg1 = (wxMetaFile *) 0 ;
     int result;
@@ -15955,21 +16079,21 @@ static PyObject *_wrap_MetaFile_GetHeight(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * MetaFile_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MetaFile_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMetaFile, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MetaFileDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -15997,11 +16121,11 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -16042,7 +16166,7 @@ static PyObject *_wrap_new_MetaFileDC(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_MetaFileDC_Close(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetaFileDC_Close(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetaFileDC *arg1 = (wxMetaFileDC *) 0 ;
     wxMetaFile *result;
@@ -16068,14 +16192,14 @@ static PyObject *_wrap_MetaFileDC_Close(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * MetaFileDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MetaFileDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMetaFileDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PrinterDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrinterDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = 0 ;
     wxPrinterDC *result;
@@ -16107,14 +16231,14 @@ static PyObject *_wrap_new_PrinterDC(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject * PrinterDC_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PrinterDC_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPrinterDC, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 ;
@@ -16130,16 +16254,16 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_ImageList",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16159,7 +16283,7 @@ static PyObject *_wrap_new_ImageList(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_ImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ImageList(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16184,7 +16308,7 @@ static PyObject *_wrap_delete_ImageList(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -16224,14 +16348,14 @@ static PyObject *_wrap_ImageList_Add(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -16266,14 +16390,14 @@ static PyObject *_wrap_ImageList_AddWithColourMask(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_AddIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -16301,14 +16425,14 @@ static PyObject *_wrap_ImageList_AddIcon(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_Replace(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     int arg2 ;
@@ -16324,7 +16448,7 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxBitmap,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -16349,7 +16473,7 @@ static PyObject *_wrap_ImageList_Replace(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     int arg2 ;
@@ -16373,7 +16497,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxDC,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -16382,16 +16506,16 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (bool const) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16410,7 +16534,7 @@ static PyObject *_wrap_ImageList_Draw(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_GetImageCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     int result;
@@ -16429,14 +16553,14 @@ static PyObject *_wrap_ImageList_GetImageCount(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_Remove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     int arg2 ;
@@ -16450,7 +16574,7 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16468,7 +16592,7 @@ static PyObject *_wrap_ImageList_Remove(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_RemoveAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     bool result;
@@ -16496,26 +16620,28 @@ static PyObject *_wrap_ImageList_RemoveAll(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ImageList_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxImageList *arg1 = (wxImageList *) 0 ;
     int arg2 ;
     int *arg3 = 0 ;
     int *arg4 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
         (char *) "self",(char *) "index", NULL 
     };
     
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16525,28 +16651,24 @@ static PyObject *_wrap_ImageList_GetSize(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * ImageList_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ImageList_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxImageList, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_NORMAL_FONT_set(PyObject *_val) {
+static int _wrap_NORMAL_FONT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NORMAL_FONT is read-only.");
     return 1;
 }
@@ -16560,7 +16682,7 @@ static PyObject *_wrap_NORMAL_FONT_get() {
 }
 
 
-static int _wrap_SMALL_FONT_set(PyObject *_val) {
+static int _wrap_SMALL_FONT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SMALL_FONT is read-only.");
     return 1;
 }
@@ -16574,7 +16696,7 @@ static PyObject *_wrap_SMALL_FONT_get() {
 }
 
 
-static int _wrap_ITALIC_FONT_set(PyObject *_val) {
+static int _wrap_ITALIC_FONT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ITALIC_FONT is read-only.");
     return 1;
 }
@@ -16588,7 +16710,7 @@ static PyObject *_wrap_ITALIC_FONT_get() {
 }
 
 
-static int _wrap_SWISS_FONT_set(PyObject *_val) {
+static int _wrap_SWISS_FONT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SWISS_FONT is read-only.");
     return 1;
 }
@@ -16602,7 +16724,7 @@ static PyObject *_wrap_SWISS_FONT_get() {
 }
 
 
-static int _wrap_RED_PEN_set(PyObject *_val) {
+static int _wrap_RED_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable RED_PEN is read-only.");
     return 1;
 }
@@ -16616,7 +16738,7 @@ static PyObject *_wrap_RED_PEN_get() {
 }
 
 
-static int _wrap_CYAN_PEN_set(PyObject *_val) {
+static int _wrap_CYAN_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable CYAN_PEN is read-only.");
     return 1;
 }
@@ -16630,7 +16752,7 @@ static PyObject *_wrap_CYAN_PEN_get() {
 }
 
 
-static int _wrap_GREEN_PEN_set(PyObject *_val) {
+static int _wrap_GREEN_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GREEN_PEN is read-only.");
     return 1;
 }
@@ -16644,7 +16766,7 @@ static PyObject *_wrap_GREEN_PEN_get() {
 }
 
 
-static int _wrap_BLACK_PEN_set(PyObject *_val) {
+static int _wrap_BLACK_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BLACK_PEN is read-only.");
     return 1;
 }
@@ -16658,7 +16780,7 @@ static PyObject *_wrap_BLACK_PEN_get() {
 }
 
 
-static int _wrap_WHITE_PEN_set(PyObject *_val) {
+static int _wrap_WHITE_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable WHITE_PEN is read-only.");
     return 1;
 }
@@ -16672,7 +16794,7 @@ static PyObject *_wrap_WHITE_PEN_get() {
 }
 
 
-static int _wrap_TRANSPARENT_PEN_set(PyObject *_val) {
+static int _wrap_TRANSPARENT_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_PEN is read-only.");
     return 1;
 }
@@ -16686,7 +16808,7 @@ static PyObject *_wrap_TRANSPARENT_PEN_get() {
 }
 
 
-static int _wrap_BLACK_DASHED_PEN_set(PyObject *_val) {
+static int _wrap_BLACK_DASHED_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BLACK_DASHED_PEN is read-only.");
     return 1;
 }
@@ -16700,7 +16822,7 @@ static PyObject *_wrap_BLACK_DASHED_PEN_get() {
 }
 
 
-static int _wrap_GREY_PEN_set(PyObject *_val) {
+static int _wrap_GREY_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GREY_PEN is read-only.");
     return 1;
 }
@@ -16714,7 +16836,7 @@ static PyObject *_wrap_GREY_PEN_get() {
 }
 
 
-static int _wrap_MEDIUM_GREY_PEN_set(PyObject *_val) {
+static int _wrap_MEDIUM_GREY_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_PEN is read-only.");
     return 1;
 }
@@ -16728,7 +16850,7 @@ static PyObject *_wrap_MEDIUM_GREY_PEN_get() {
 }
 
 
-static int _wrap_LIGHT_GREY_PEN_set(PyObject *_val) {
+static int _wrap_LIGHT_GREY_PEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_PEN is read-only.");
     return 1;
 }
@@ -16742,7 +16864,7 @@ static PyObject *_wrap_LIGHT_GREY_PEN_get() {
 }
 
 
-static int _wrap_BLUE_BRUSH_set(PyObject *_val) {
+static int _wrap_BLUE_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BLUE_BRUSH is read-only.");
     return 1;
 }
@@ -16756,7 +16878,7 @@ static PyObject *_wrap_BLUE_BRUSH_get() {
 }
 
 
-static int _wrap_GREEN_BRUSH_set(PyObject *_val) {
+static int _wrap_GREEN_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GREEN_BRUSH is read-only.");
     return 1;
 }
@@ -16770,7 +16892,7 @@ static PyObject *_wrap_GREEN_BRUSH_get() {
 }
 
 
-static int _wrap_WHITE_BRUSH_set(PyObject *_val) {
+static int _wrap_WHITE_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable WHITE_BRUSH is read-only.");
     return 1;
 }
@@ -16784,7 +16906,7 @@ static PyObject *_wrap_WHITE_BRUSH_get() {
 }
 
 
-static int _wrap_BLACK_BRUSH_set(PyObject *_val) {
+static int _wrap_BLACK_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BLACK_BRUSH is read-only.");
     return 1;
 }
@@ -16798,7 +16920,7 @@ static PyObject *_wrap_BLACK_BRUSH_get() {
 }
 
 
-static int _wrap_TRANSPARENT_BRUSH_set(PyObject *_val) {
+static int _wrap_TRANSPARENT_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TRANSPARENT_BRUSH is read-only.");
     return 1;
 }
@@ -16812,7 +16934,7 @@ static PyObject *_wrap_TRANSPARENT_BRUSH_get() {
 }
 
 
-static int _wrap_CYAN_BRUSH_set(PyObject *_val) {
+static int _wrap_CYAN_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable CYAN_BRUSH is read-only.");
     return 1;
 }
@@ -16826,7 +16948,7 @@ static PyObject *_wrap_CYAN_BRUSH_get() {
 }
 
 
-static int _wrap_RED_BRUSH_set(PyObject *_val) {
+static int _wrap_RED_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable RED_BRUSH is read-only.");
     return 1;
 }
@@ -16840,7 +16962,7 @@ static PyObject *_wrap_RED_BRUSH_get() {
 }
 
 
-static int _wrap_GREY_BRUSH_set(PyObject *_val) {
+static int _wrap_GREY_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GREY_BRUSH is read-only.");
     return 1;
 }
@@ -16854,7 +16976,7 @@ static PyObject *_wrap_GREY_BRUSH_get() {
 }
 
 
-static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *_val) {
+static int _wrap_MEDIUM_GREY_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable MEDIUM_GREY_BRUSH is read-only.");
     return 1;
 }
@@ -16868,7 +16990,7 @@ static PyObject *_wrap_MEDIUM_GREY_BRUSH_get() {
 }
 
 
-static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *_val) {
+static int _wrap_LIGHT_GREY_BRUSH_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY_BRUSH is read-only.");
     return 1;
 }
@@ -16882,7 +17004,7 @@ static PyObject *_wrap_LIGHT_GREY_BRUSH_get() {
 }
 
 
-static int _wrap_BLACK_set(PyObject *_val) {
+static int _wrap_BLACK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BLACK is read-only.");
     return 1;
 }
@@ -16896,7 +17018,7 @@ static PyObject *_wrap_BLACK_get() {
 }
 
 
-static int _wrap_WHITE_set(PyObject *_val) {
+static int _wrap_WHITE_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable WHITE is read-only.");
     return 1;
 }
@@ -16910,7 +17032,7 @@ static PyObject *_wrap_WHITE_get() {
 }
 
 
-static int _wrap_RED_set(PyObject *_val) {
+static int _wrap_RED_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable RED is read-only.");
     return 1;
 }
@@ -16924,7 +17046,7 @@ static PyObject *_wrap_RED_get() {
 }
 
 
-static int _wrap_BLUE_set(PyObject *_val) {
+static int _wrap_BLUE_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable BLUE is read-only.");
     return 1;
 }
@@ -16938,7 +17060,7 @@ static PyObject *_wrap_BLUE_get() {
 }
 
 
-static int _wrap_GREEN_set(PyObject *_val) {
+static int _wrap_GREEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GREEN is read-only.");
     return 1;
 }
@@ -16952,7 +17074,7 @@ static PyObject *_wrap_GREEN_get() {
 }
 
 
-static int _wrap_CYAN_set(PyObject *_val) {
+static int _wrap_CYAN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable CYAN is read-only.");
     return 1;
 }
@@ -16966,7 +17088,7 @@ static PyObject *_wrap_CYAN_get() {
 }
 
 
-static int _wrap_LIGHT_GREY_set(PyObject *_val) {
+static int _wrap_LIGHT_GREY_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable LIGHT_GREY is read-only.");
     return 1;
 }
@@ -16980,7 +17102,7 @@ static PyObject *_wrap_LIGHT_GREY_get() {
 }
 
 
-static int _wrap_STANDARD_CURSOR_set(PyObject *_val) {
+static int _wrap_STANDARD_CURSOR_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable STANDARD_CURSOR is read-only.");
     return 1;
 }
@@ -16994,7 +17116,7 @@ static PyObject *_wrap_STANDARD_CURSOR_get() {
 }
 
 
-static int _wrap_HOURGLASS_CURSOR_set(PyObject *_val) {
+static int _wrap_HOURGLASS_CURSOR_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable HOURGLASS_CURSOR is read-only.");
     return 1;
 }
@@ -17008,7 +17130,7 @@ static PyObject *_wrap_HOURGLASS_CURSOR_get() {
 }
 
 
-static int _wrap_CROSS_CURSOR_set(PyObject *_val) {
+static int _wrap_CROSS_CURSOR_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable CROSS_CURSOR is read-only.");
     return 1;
 }
@@ -17022,7 +17144,7 @@ static PyObject *_wrap_CROSS_CURSOR_get() {
 }
 
 
-static int _wrap_NullBitmap_set(PyObject *_val) {
+static int _wrap_NullBitmap_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullBitmap is read-only.");
     return 1;
 }
@@ -17036,7 +17158,7 @@ static PyObject *_wrap_NullBitmap_get() {
 }
 
 
-static int _wrap_NullIcon_set(PyObject *_val) {
+static int _wrap_NullIcon_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullIcon is read-only.");
     return 1;
 }
@@ -17050,7 +17172,7 @@ static PyObject *_wrap_NullIcon_get() {
 }
 
 
-static int _wrap_NullCursor_set(PyObject *_val) {
+static int _wrap_NullCursor_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullCursor is read-only.");
     return 1;
 }
@@ -17064,7 +17186,7 @@ static PyObject *_wrap_NullCursor_get() {
 }
 
 
-static int _wrap_NullPen_set(PyObject *_val) {
+static int _wrap_NullPen_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullPen is read-only.");
     return 1;
 }
@@ -17078,7 +17200,7 @@ static PyObject *_wrap_NullPen_get() {
 }
 
 
-static int _wrap_NullBrush_set(PyObject *_val) {
+static int _wrap_NullBrush_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullBrush is read-only.");
     return 1;
 }
@@ -17092,7 +17214,7 @@ static PyObject *_wrap_NullBrush_get() {
 }
 
 
-static int _wrap_NullPalette_set(PyObject *_val) {
+static int _wrap_NullPalette_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullPalette is read-only.");
     return 1;
 }
@@ -17106,7 +17228,7 @@ static PyObject *_wrap_NullPalette_get() {
 }
 
 
-static int _wrap_NullFont_set(PyObject *_val) {
+static int _wrap_NullFont_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullFont is read-only.");
     return 1;
 }
@@ -17120,7 +17242,7 @@ static PyObject *_wrap_NullFont_get() {
 }
 
 
-static int _wrap_NullColour_set(PyObject *_val) {
+static int _wrap_NullColour_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable NullColour is read-only.");
     return 1;
 }
@@ -17134,7 +17256,7 @@ static PyObject *_wrap_NullColour_get() {
 }
 
 
-static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_AddPen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPenList *arg1 = (wxPenList *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -17163,7 +17285,7 @@ static PyObject *_wrap_PenList_AddPen(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPenList *arg1 = (wxPenList *) 0 ;
     wxColour *arg2 = 0 ;
@@ -17186,9 +17308,9 @@ static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, P
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17204,7 +17326,7 @@ static PyObject *_wrap_PenList_FindOrCreatePen(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_RemovePen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPenList *arg1 = (wxPenList *) 0 ;
     wxPen *arg2 = (wxPen *) 0 ;
@@ -17233,7 +17355,7 @@ static PyObject *_wrap_PenList_RemovePen(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PenList_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPenList *arg1 = (wxPenList *) 0 ;
     int result;
@@ -17252,21 +17374,21 @@ static PyObject *_wrap_PenList_GetCount(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PenList_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PenList_swigregister(PyObject *, 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) {
+static PyObject *_wrap_BrushList_AddBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrushList *arg1 = (wxBrushList *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -17295,7 +17417,7 @@ static PyObject *_wrap_BrushList_AddBrush(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrushList *arg1 = (wxBrushList *) 0 ;
     wxColour *arg2 = 0 ;
@@ -17316,7 +17438,7 @@ static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *arg
         arg2 = &temp2;
         if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17332,7 +17454,7 @@ static PyObject *_wrap_BrushList_FindOrCreateBrush(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BrushList_RemoveBrush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrushList *arg1 = (wxBrushList *) 0 ;
     wxBrush *arg2 = (wxBrush *) 0 ;
@@ -17361,7 +17483,7 @@ static PyObject *_wrap_BrushList_RemoveBrush(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BrushList_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBrushList *arg1 = (wxBrushList *) 0 ;
     int result;
@@ -17380,21 +17502,21 @@ static PyObject *_wrap_BrushList_GetCount(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * BrushList_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BrushList_swigregister(PyObject *, 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) {
+static PyObject *_wrap_new_ColourDatabase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDatabase *result;
     char *kwnames[] = {
@@ -17417,7 +17539,7 @@ static PyObject *_wrap_new_ColourDatabase(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ColourDatabase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17442,7 +17564,7 @@ static PyObject *_wrap_delete_ColourDatabase(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_Find(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     wxString *arg2 = 0 ;
@@ -17488,7 +17610,7 @@ static PyObject *_wrap_ColourDatabase_Find(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_FindName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     wxColour *arg2 = 0 ;
@@ -17527,7 +17649,7 @@ static PyObject *_wrap_ColourDatabase_FindName(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_AddColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     wxString *arg2 = 0 ;
@@ -17575,7 +17697,7 @@ static PyObject *_wrap_ColourDatabase_AddColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDatabase_Append(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDatabase *arg1 = (wxColourDatabase *) 0 ;
     wxString *arg2 = 0 ;
@@ -17600,11 +17722,11 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyO
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17628,14 +17750,14 @@ static PyObject *_wrap_ColourDatabase_Append(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * ColourDatabase_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ColourDatabase_swigregister(PyObject *, 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) {
+static PyObject *_wrap_FontList_AddFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontList *arg1 = (wxFontList *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -17664,7 +17786,7 @@ static PyObject *_wrap_FontList_AddFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontList *arg1 = (wxFontList *) 0 ;
     int arg2 ;
@@ -17692,16 +17814,16 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args,
     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); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (bool) SWIG_AsBool(obj5); 
+        arg6 = (bool)SWIG_As_bool(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -17712,7 +17834,7 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args,
         }
     }
     if (obj7) {
-        arg8 = (wxFontEncoding) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17737,7 +17859,7 @@ static PyObject *_wrap_FontList_FindOrCreateFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontList_RemoveFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontList *arg1 = (wxFontList *) 0 ;
     wxFont *arg2 = (wxFont *) 0 ;
@@ -17766,7 +17888,7 @@ static PyObject *_wrap_FontList_RemoveFont(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontList_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontList *arg1 = (wxFontList *) 0 ;
     int result;
@@ -17785,21 +17907,21 @@ static PyObject *_wrap_FontList_GetCount(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * FontList_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FontList_swigregister(PyObject *, 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_TheFontList_set(PyObject *_val) {
+static int _wrap_TheFontList_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TheFontList is read-only.");
     return 1;
 }
@@ -17813,7 +17935,7 @@ static PyObject *_wrap_TheFontList_get() {
 }
 
 
-static int _wrap_ThePenList_set(PyObject *_val) {
+static int _wrap_ThePenList_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ThePenList is read-only.");
     return 1;
 }
@@ -17827,7 +17949,7 @@ static PyObject *_wrap_ThePenList_get() {
 }
 
 
-static int _wrap_TheBrushList_set(PyObject *_val) {
+static int _wrap_TheBrushList_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TheBrushList is read-only.");
     return 1;
 }
@@ -17841,7 +17963,7 @@ static PyObject *_wrap_TheBrushList_get() {
 }
 
 
-static int _wrap_TheColourDatabase_set(PyObject *_val) {
+static int _wrap_TheColourDatabase_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TheColourDatabase is read-only.");
     return 1;
 }
@@ -17855,7 +17977,7 @@ static PyObject *_wrap_TheColourDatabase_get() {
 }
 
 
-static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Effects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *result;
     char *kwnames[] = {
@@ -17877,7 +17999,7 @@ static PyObject *_wrap_new_Effects(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetHighlightColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour result;
@@ -17907,7 +18029,7 @@ static PyObject *_wrap_Effects_GetHighlightColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Effects_GetLightShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetLightShadow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour result;
@@ -17937,7 +18059,7 @@ static PyObject *_wrap_Effects_GetLightShadow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Effects_GetFaceColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetFaceColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour result;
@@ -17967,7 +18089,7 @@ static PyObject *_wrap_Effects_GetFaceColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Effects_GetMediumShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetMediumShadow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour result;
@@ -17997,7 +18119,7 @@ static PyObject *_wrap_Effects_GetMediumShadow(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Effects_GetDarkShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_GetDarkShadow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour result;
@@ -18027,7 +18149,7 @@ static PyObject *_wrap_Effects_GetDarkShadow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Effects_SetHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_SetHighlightColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18059,7 +18181,7 @@ static PyObject *_wrap_Effects_SetHighlightColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Effects_SetLightShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_SetLightShadow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18091,7 +18213,7 @@ static PyObject *_wrap_Effects_SetLightShadow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Effects_SetFaceColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_SetFaceColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18123,7 +18245,7 @@ static PyObject *_wrap_Effects_SetFaceColour(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Effects_SetMediumShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_SetMediumShadow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18155,7 +18277,7 @@ static PyObject *_wrap_Effects_SetMediumShadow(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Effects_SetDarkShadow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_SetDarkShadow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18187,7 +18309,7 @@ static PyObject *_wrap_Effects_SetDarkShadow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Effects_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxColour *arg2 = 0 ;
@@ -18247,7 +18369,7 @@ static PyObject *_wrap_Effects_Set(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxDC *arg2 = 0 ;
@@ -18277,7 +18399,7 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py
         if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18294,7 +18416,7 @@ static PyObject *_wrap_Effects_DrawSunkenEdge(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Effects_TileBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEffects *arg1 = (wxEffects *) 0 ;
     wxRect *arg2 = 0 ;
@@ -18347,7 +18469,7 @@ static PyObject *_wrap_Effects_TileBitmap(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * Effects_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Effects_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxEffects, obj);
@@ -18355,532 +18477,532 @@ static PyObject * Effects_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_GDIObject", (PyCFunction) _wrap_new_GDIObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_GDIObject", (PyCFunction) _wrap_delete_GDIObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GDIObject_GetVisible", (PyCFunction) _wrap_GDIObject_GetVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GDIObject_SetVisible", (PyCFunction) _wrap_GDIObject_SetVisible, 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 *)"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_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_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 *)"Palette_GetPixel", (PyCFunction) _wrap_Palette_GetPixel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Palette_GetRGB", (PyCFunction) _wrap_Palette_GetRGB, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Palette_Ok", (PyCFunction) _wrap_Palette_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Palette_swigregister", Palette_swigregister, METH_VARARGS },
-        { (char *)"new_Pen", (PyCFunction) _wrap_new_Pen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Pen", (PyCFunction) _wrap_delete_Pen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_GetCap", (PyCFunction) _wrap_Pen_GetCap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_GetColour", (PyCFunction) _wrap_Pen_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_GetJoin", (PyCFunction) _wrap_Pen_GetJoin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_GetStyle", (PyCFunction) _wrap_Pen_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_GetWidth", (PyCFunction) _wrap_Pen_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_Ok", (PyCFunction) _wrap_Pen_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_SetCap", (PyCFunction) _wrap_Pen_SetCap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_SetColour", (PyCFunction) _wrap_Pen_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_SetJoin", (PyCFunction) _wrap_Pen_SetJoin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Pen_SetStyle", (PyCFunction) _wrap_Pen_SetStyle, 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__SetDashes", (PyCFunction) _wrap_Pen__SetDashes, 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_swigregister", Pen_swigregister, METH_VARARGS },
-        { (char *)"new_Brush", (PyCFunction) _wrap_new_Brush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Brush", (PyCFunction) _wrap_delete_Brush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_SetColour", (PyCFunction) _wrap_Brush_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_SetStyle", (PyCFunction) _wrap_Brush_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_SetStipple", (PyCFunction) _wrap_Brush_SetStipple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_GetColour", (PyCFunction) _wrap_Brush_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_GetStyle", (PyCFunction) _wrap_Brush_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_GetStipple", (PyCFunction) _wrap_Brush_GetStipple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_Ok", (PyCFunction) _wrap_Brush_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_MacGetTheme", (PyCFunction) _wrap_Brush_MacGetTheme, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_MacSetTheme", (PyCFunction) _wrap_Brush_MacSetTheme, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Brush_swigregister", Brush_swigregister, METH_VARARGS },
-        { (char *)"new_Bitmap", (PyCFunction) _wrap_new_Bitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Bitmap", (PyCFunction) _wrap_delete_Bitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_EmptyBitmap", (PyCFunction) _wrap_new_EmptyBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_BitmapFromIcon", (PyCFunction) _wrap_new_BitmapFromIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_BitmapFromImage", (PyCFunction) _wrap_new_BitmapFromImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_BitmapFromXPMData", (PyCFunction) _wrap_new_BitmapFromXPMData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_BitmapFromBits", (PyCFunction) _wrap_new_BitmapFromBits, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_Ok", (PyCFunction) _wrap_Bitmap_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_GetWidth", (PyCFunction) _wrap_Bitmap_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_GetHeight", (PyCFunction) _wrap_Bitmap_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_GetDepth", (PyCFunction) _wrap_Bitmap_GetDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_GetSize", (PyCFunction) _wrap_Bitmap_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_ConvertToImage", (PyCFunction) _wrap_Bitmap_ConvertToImage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_GetMask", (PyCFunction) _wrap_Bitmap_GetMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_SetMask", (PyCFunction) _wrap_Bitmap_SetMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_SetMaskColour", (PyCFunction) _wrap_Bitmap_SetMaskColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_GetSubBitmap", (PyCFunction) _wrap_Bitmap_GetSubBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_SaveFile", (PyCFunction) _wrap_Bitmap_SaveFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_LoadFile", (PyCFunction) _wrap_Bitmap_LoadFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bitmap_CopyFromIcon", (PyCFunction) _wrap_Bitmap_CopyFromIcon, 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_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, 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 *)"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 *)"new_EmptyIcon", (PyCFunction) _wrap_new_EmptyIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_IconFromLocation", (PyCFunction) _wrap_new_IconFromLocation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_IconFromBitmap", (PyCFunction) _wrap_new_IconFromBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_IconFromXPMData", (PyCFunction) _wrap_new_IconFromXPMData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_Ok", (PyCFunction) _wrap_Icon_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_GetWidth", (PyCFunction) _wrap_Icon_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_GetHeight", (PyCFunction) _wrap_Icon_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_GetDepth", (PyCFunction) _wrap_Icon_GetDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_SetWidth", (PyCFunction) _wrap_Icon_SetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_SetHeight", (PyCFunction) _wrap_Icon_SetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_SetDepth", (PyCFunction) _wrap_Icon_SetDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_CopyFromBitmap", (PyCFunction) _wrap_Icon_CopyFromBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Icon_swigregister", Icon_swigregister, METH_VARARGS },
-        { (char *)"new_IconLocation", (PyCFunction) _wrap_new_IconLocation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_IconLocation", (PyCFunction) _wrap_delete_IconLocation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconLocation_IsOk", (PyCFunction) _wrap_IconLocation_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconLocation_SetFileName", (PyCFunction) _wrap_IconLocation_SetFileName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconLocation_GetFileName", (PyCFunction) _wrap_IconLocation_GetFileName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconLocation_SetIndex", (PyCFunction) _wrap_IconLocation_SetIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconLocation_GetIndex", (PyCFunction) _wrap_IconLocation_GetIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconLocation_swigregister", IconLocation_swigregister, METH_VARARGS },
-        { (char *)"new_IconBundle", (PyCFunction) _wrap_new_IconBundle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_IconBundleFromFile", (PyCFunction) _wrap_new_IconBundleFromFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_IconBundleFromIcon", (PyCFunction) _wrap_new_IconBundleFromIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_IconBundle", (PyCFunction) _wrap_delete_IconBundle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconBundle_AddIcon", (PyCFunction) _wrap_IconBundle_AddIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconBundle_AddIconFromFile", (PyCFunction) _wrap_IconBundle_AddIconFromFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconBundle_GetIcon", (PyCFunction) _wrap_IconBundle_GetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IconBundle_swigregister", IconBundle_swigregister, METH_VARARGS },
-        { (char *)"new_Cursor", (PyCFunction) _wrap_new_Cursor, 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 *)"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 *)"new_RegionFromBitmap", (PyCFunction) _wrap_new_RegionFromBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_RegionFromBitmapColour", (PyCFunction) _wrap_new_RegionFromBitmapColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_RegionFromPoints", (PyCFunction) _wrap_new_RegionFromPoints, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Region", (PyCFunction) _wrap_delete_Region, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_Clear", (PyCFunction) _wrap_Region_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_Contains", (PyCFunction) _wrap_Region_Contains, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_ContainsPoint", (PyCFunction) _wrap_Region_ContainsPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_ContainsRect", (PyCFunction) _wrap_Region_ContainsRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_ContainsRectDim", (PyCFunction) _wrap_Region_ContainsRectDim, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_GetBox", (PyCFunction) _wrap_Region_GetBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_Intersect", (PyCFunction) _wrap_Region_Intersect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_IntersectRect", (PyCFunction) _wrap_Region_IntersectRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_IntersectRegion", (PyCFunction) _wrap_Region_IntersectRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_IsEmpty", (PyCFunction) _wrap_Region_IsEmpty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_Union", (PyCFunction) _wrap_Region_Union, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_UnionRect", (PyCFunction) _wrap_Region_UnionRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_UnionRegion", (PyCFunction) _wrap_Region_UnionRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_Subtract", (PyCFunction) _wrap_Region_Subtract, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_SubtractRect", (PyCFunction) _wrap_Region_SubtractRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_SubtractRegion", (PyCFunction) _wrap_Region_SubtractRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_Xor", (PyCFunction) _wrap_Region_Xor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_XorRect", (PyCFunction) _wrap_Region_XorRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_XorRegion", (PyCFunction) _wrap_Region_XorRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_ConvertToBitmap", (PyCFunction) _wrap_Region_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_UnionBitmap", (PyCFunction) _wrap_Region_UnionBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_UnionBitmapColour", (PyCFunction) _wrap_Region_UnionBitmapColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Region_swigregister", Region_swigregister, METH_VARARGS },
-        { (char *)"new_RegionIterator", (PyCFunction) _wrap_new_RegionIterator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_RegionIterator", (PyCFunction) _wrap_delete_RegionIterator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetX", (PyCFunction) _wrap_RegionIterator_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetY", (PyCFunction) _wrap_RegionIterator_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetW", (PyCFunction) _wrap_RegionIterator_GetW, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetWidth", (PyCFunction) _wrap_RegionIterator_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetH", (PyCFunction) _wrap_RegionIterator_GetH, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetHeight", (PyCFunction) _wrap_RegionIterator_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_GetRect", (PyCFunction) _wrap_RegionIterator_GetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_HaveRects", (PyCFunction) _wrap_RegionIterator_HaveRects, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_Reset", (PyCFunction) _wrap_RegionIterator_Reset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_Next", (PyCFunction) _wrap_RegionIterator_Next, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator___nonzero__", (PyCFunction) _wrap_RegionIterator___nonzero__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegionIterator_swigregister", RegionIterator_swigregister, METH_VARARGS },
-        { (char *)"new_NativeFontInfo", (PyCFunction) _wrap_new_NativeFontInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_NativeFontInfo", (PyCFunction) _wrap_delete_NativeFontInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_Init", (PyCFunction) _wrap_NativeFontInfo_Init, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_InitFromFont", (PyCFunction) _wrap_NativeFontInfo_InitFromFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetPointSize", (PyCFunction) _wrap_NativeFontInfo_GetPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetStyle", (PyCFunction) _wrap_NativeFontInfo_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetWeight", (PyCFunction) _wrap_NativeFontInfo_GetWeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetUnderlined", (PyCFunction) _wrap_NativeFontInfo_GetUnderlined, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetFaceName", (PyCFunction) _wrap_NativeFontInfo_GetFaceName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetFamily", (PyCFunction) _wrap_NativeFontInfo_GetFamily, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_GetEncoding", (PyCFunction) _wrap_NativeFontInfo_GetEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetPointSize", (PyCFunction) _wrap_NativeFontInfo_SetPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetStyle", (PyCFunction) _wrap_NativeFontInfo_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetWeight", (PyCFunction) _wrap_NativeFontInfo_SetWeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetUnderlined", (PyCFunction) _wrap_NativeFontInfo_SetUnderlined, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetFaceName", (PyCFunction) _wrap_NativeFontInfo_SetFaceName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetFamily", (PyCFunction) _wrap_NativeFontInfo_SetFamily, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_SetEncoding", (PyCFunction) _wrap_NativeFontInfo_SetEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_FromString", (PyCFunction) _wrap_NativeFontInfo_FromString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_ToString", (PyCFunction) _wrap_NativeFontInfo_ToString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo___str__", (PyCFunction) _wrap_NativeFontInfo___str__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_FromUserString", (PyCFunction) _wrap_NativeFontInfo_FromUserString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_ToUserString", (PyCFunction) _wrap_NativeFontInfo_ToUserString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeFontInfo_swigregister", NativeFontInfo_swigregister, METH_VARARGS },
-        { (char *)"NativeEncodingInfo_facename_set", (PyCFunction) _wrap_NativeEncodingInfo_facename_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeEncodingInfo_facename_get", (PyCFunction) _wrap_NativeEncodingInfo_facename_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeEncodingInfo_encoding_set", (PyCFunction) _wrap_NativeEncodingInfo_encoding_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeEncodingInfo_encoding_get", (PyCFunction) _wrap_NativeEncodingInfo_encoding_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_NativeEncodingInfo", (PyCFunction) _wrap_new_NativeEncodingInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_NativeEncodingInfo", (PyCFunction) _wrap_delete_NativeEncodingInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeEncodingInfo_FromString", (PyCFunction) _wrap_NativeEncodingInfo_FromString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeEncodingInfo_ToString", (PyCFunction) _wrap_NativeEncodingInfo_ToString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"NativeEncodingInfo_swigregister", NativeEncodingInfo_swigregister, METH_VARARGS },
-        { (char *)"GetNativeFontEncoding", (PyCFunction) _wrap_GetNativeFontEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TestFontEncoding", (PyCFunction) _wrap_TestFontEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_FontMapper", (PyCFunction) _wrap_new_FontMapper, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FontMapper", (PyCFunction) _wrap_delete_FontMapper, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_Get", (PyCFunction) _wrap_FontMapper_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_Set", (PyCFunction) _wrap_FontMapper_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_CharsetToEncoding", (PyCFunction) _wrap_FontMapper_CharsetToEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetSupportedEncodingsCount", (PyCFunction) _wrap_FontMapper_GetSupportedEncodingsCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetEncoding", (PyCFunction) _wrap_FontMapper_GetEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetEncodingName", (PyCFunction) _wrap_FontMapper_GetEncodingName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetEncodingDescription", (PyCFunction) _wrap_FontMapper_GetEncodingDescription, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetEncodingFromName", (PyCFunction) _wrap_FontMapper_GetEncodingFromName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_SetConfig", (PyCFunction) _wrap_FontMapper_SetConfig, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_SetConfigPath", (PyCFunction) _wrap_FontMapper_SetConfigPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetDefaultConfigPath", (PyCFunction) _wrap_FontMapper_GetDefaultConfigPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_GetAltForEncoding", (PyCFunction) _wrap_FontMapper_GetAltForEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_IsEncodingAvailable", (PyCFunction) _wrap_FontMapper_IsEncodingAvailable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_SetDialogParent", (PyCFunction) _wrap_FontMapper_SetDialogParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_SetDialogTitle", (PyCFunction) _wrap_FontMapper_SetDialogTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontMapper_swigregister", FontMapper_swigregister, METH_VARARGS },
-        { (char *)"new_Font", (PyCFunction) _wrap_new_Font, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Font", (PyCFunction) _wrap_delete_Font, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetPointSize", (PyCFunction) _wrap_Font_GetPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetFamily", (PyCFunction) _wrap_Font_GetFamily, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetStyle", (PyCFunction) _wrap_Font_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetWeight", (PyCFunction) _wrap_Font_GetWeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetUnderlined", (PyCFunction) _wrap_Font_GetUnderlined, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetFaceName", (PyCFunction) _wrap_Font_GetFaceName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetEncoding", (PyCFunction) _wrap_Font_GetEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetNativeFontInfo", (PyCFunction) _wrap_Font_GetNativeFontInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_IsFixedWidth", (PyCFunction) _wrap_Font_IsFixedWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetNativeFontInfoDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetPointSize", (PyCFunction) _wrap_Font_SetPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetFamily", (PyCFunction) _wrap_Font_SetFamily, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetStyle", (PyCFunction) _wrap_Font_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetWeight", (PyCFunction) _wrap_Font_SetWeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetFaceName", (PyCFunction) _wrap_Font_SetFaceName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetUnderlined", (PyCFunction) _wrap_Font_SetUnderlined, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetEncoding", (PyCFunction) _wrap_Font_SetEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetNativeFontInfo", (PyCFunction) _wrap_Font_SetNativeFontInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetNativeFontInfoFromString", (PyCFunction) _wrap_Font_SetNativeFontInfoFromString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_SetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetFamilyString", (PyCFunction) _wrap_Font_GetFamilyString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetStyleString", (PyCFunction) _wrap_Font_GetStyleString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetWeightString", (PyCFunction) _wrap_Font_GetWeightString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetNoAntiAliasing", (PyCFunction) _wrap_Font_SetNoAntiAliasing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetNoAntiAliasing", (PyCFunction) _wrap_Font_GetNoAntiAliasing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_GetDefaultEncoding", (PyCFunction) _wrap_Font_GetDefaultEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_SetDefaultEncoding", (PyCFunction) _wrap_Font_SetDefaultEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Font_swigregister", Font_swigregister, METH_VARARGS },
-        { (char *)"new_FontEnumerator", (PyCFunction) _wrap_new_FontEnumerator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FontEnumerator", (PyCFunction) _wrap_delete_FontEnumerator, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontEnumerator__setCallbackInfo", (PyCFunction) _wrap_FontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_FontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_FontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontEnumerator_GetEncodings", (PyCFunction) _wrap_FontEnumerator_GetEncodings, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontEnumerator_GetFacenames", (PyCFunction) _wrap_FontEnumerator_GetFacenames, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontEnumerator_swigregister", FontEnumerator_swigregister, METH_VARARGS },
-        { (char *)"LanguageInfo_Language_set", (PyCFunction) _wrap_LanguageInfo_Language_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LanguageInfo_Language_get", (PyCFunction) _wrap_LanguageInfo_Language_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LanguageInfo_CanonicalName_set", (PyCFunction) _wrap_LanguageInfo_CanonicalName_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LanguageInfo_CanonicalName_get", (PyCFunction) _wrap_LanguageInfo_CanonicalName_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LanguageInfo_Description_set", (PyCFunction) _wrap_LanguageInfo_Description_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LanguageInfo_Description_get", (PyCFunction) _wrap_LanguageInfo_Description_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LanguageInfo_swigregister", LanguageInfo_swigregister, METH_VARARGS },
-        { (char *)"new_Locale", (PyCFunction) _wrap_new_Locale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Locale", (PyCFunction) _wrap_delete_Locale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_Init1", (PyCFunction) _wrap_Locale_Init1, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_Init2", (PyCFunction) _wrap_Locale_Init2, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetSystemLanguage", (PyCFunction) _wrap_Locale_GetSystemLanguage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetSystemEncoding", (PyCFunction) _wrap_Locale_GetSystemEncoding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetSystemEncodingName", (PyCFunction) _wrap_Locale_GetSystemEncodingName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_IsOk", (PyCFunction) _wrap_Locale_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetLocale", (PyCFunction) _wrap_Locale_GetLocale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetLanguage", (PyCFunction) _wrap_Locale_GetLanguage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetSysName", (PyCFunction) _wrap_Locale_GetSysName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetCanonicalName", (PyCFunction) _wrap_Locale_GetCanonicalName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_FindLanguageInfo", (PyCFunction) _wrap_Locale_FindLanguageInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_AddLanguage", (PyCFunction) _wrap_Locale_AddLanguage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetString", (PyCFunction) _wrap_Locale_GetString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_GetName", (PyCFunction) _wrap_Locale_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Locale_swigregister", Locale_swigregister, METH_VARARGS },
-        { (char *)"GetLocale", (PyCFunction) _wrap_GetLocale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetTranslation", _wrap_GetTranslation, METH_VARARGS },
-        { (char *)"new_EncodingConverter", (PyCFunction) _wrap_new_EncodingConverter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_EncodingConverter", (PyCFunction) _wrap_delete_EncodingConverter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EncodingConverter_Init", (PyCFunction) _wrap_EncodingConverter_Init, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EncodingConverter_Convert", (PyCFunction) _wrap_EncodingConverter_Convert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EncodingConverter_GetPlatformEquivalents", (PyCFunction) _wrap_EncodingConverter_GetPlatformEquivalents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EncodingConverter_GetAllEquivalents", (PyCFunction) _wrap_EncodingConverter_GetAllEquivalents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EncodingConverter_CanConvert", (PyCFunction) _wrap_EncodingConverter_CanConvert, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EncodingConverter_swigregister", EncodingConverter_swigregister, METH_VARARGS },
-        { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_BeginDrawing", (PyCFunction) _wrap_DC_BeginDrawing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_EndDrawing", (PyCFunction) _wrap_DC_EndDrawing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetPixelPoint", (PyCFunction) _wrap_DC_GetPixelPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawLine", (PyCFunction) _wrap_DC_DrawLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawLinePoint", (PyCFunction) _wrap_DC_DrawLinePoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_CrossHair", (PyCFunction) _wrap_DC_CrossHair, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_CrossHairPoint", (PyCFunction) _wrap_DC_CrossHairPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawArc", (PyCFunction) _wrap_DC_DrawArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawArcPoint", (PyCFunction) _wrap_DC_DrawArcPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawCheckMark", (PyCFunction) _wrap_DC_DrawCheckMark, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawCheckMarkRect", (PyCFunction) _wrap_DC_DrawCheckMarkRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawEllipticArc", (PyCFunction) _wrap_DC_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawEllipticArcPointSize", (PyCFunction) _wrap_DC_DrawEllipticArcPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawPoint", (PyCFunction) _wrap_DC_DrawPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawPointPoint", (PyCFunction) _wrap_DC_DrawPointPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRectangle", (PyCFunction) _wrap_DC_DrawRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRectangleRect", (PyCFunction) _wrap_DC_DrawRectangleRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRectanglePointSize", (PyCFunction) _wrap_DC_DrawRectanglePointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRoundedRectangle", (PyCFunction) _wrap_DC_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRoundedRectangleRect", (PyCFunction) _wrap_DC_DrawRoundedRectangleRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRoundedRectanglePointSize", (PyCFunction) _wrap_DC_DrawRoundedRectanglePointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawCircle", (PyCFunction) _wrap_DC_DrawCircle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawCirclePoint", (PyCFunction) _wrap_DC_DrawCirclePoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawEllipse", (PyCFunction) _wrap_DC_DrawEllipse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawEllipseRect", (PyCFunction) _wrap_DC_DrawEllipseRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawEllipsePointSize", (PyCFunction) _wrap_DC_DrawEllipsePointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawIcon", (PyCFunction) _wrap_DC_DrawIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawIconPoint", (PyCFunction) _wrap_DC_DrawIconPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawBitmap", (PyCFunction) _wrap_DC_DrawBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawBitmapPoint", (PyCFunction) _wrap_DC_DrawBitmapPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawText", (PyCFunction) _wrap_DC_DrawText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawTextPoint", (PyCFunction) _wrap_DC_DrawTextPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRotatedText", (PyCFunction) _wrap_DC_DrawRotatedText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawLines", (PyCFunction) _wrap_DC_DrawLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawPolygon", (PyCFunction) _wrap_DC_DrawPolygon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawLabel", (PyCFunction) _wrap_DC_DrawLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawImageLabel", (PyCFunction) _wrap_DC_DrawImageLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_DrawSpline", (PyCFunction) _wrap_DC_DrawSpline, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_Clear", (PyCFunction) _wrap_DC_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_StartDoc", (PyCFunction) _wrap_DC_StartDoc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_EndDoc", (PyCFunction) _wrap_DC_EndDoc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_StartPage", (PyCFunction) _wrap_DC_StartPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_EndPage", (PyCFunction) _wrap_DC_EndPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetFont", (PyCFunction) _wrap_DC_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetPen", (PyCFunction) _wrap_DC_SetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetBrush", (PyCFunction) _wrap_DC_SetBrush, 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_DestroyClippingRegion", (PyCFunction) _wrap_DC_DestroyClippingRegion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetClippingBox", (PyCFunction) _wrap_DC_GetClippingBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetClippingRect", (PyCFunction) _wrap_DC_GetClippingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetCharHeight", (PyCFunction) _wrap_DC_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetCharWidth", (PyCFunction) _wrap_DC_GetCharWidth, 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_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, 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_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_DeviceToLogicalYRel", (PyCFunction) _wrap_DC_DeviceToLogicalYRel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_LogicalToDeviceX", (PyCFunction) _wrap_DC_LogicalToDeviceX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_LogicalToDeviceY", (PyCFunction) _wrap_DC_LogicalToDeviceY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_LogicalToDeviceXRel", (PyCFunction) _wrap_DC_LogicalToDeviceXRel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_LogicalToDeviceYRel", (PyCFunction) _wrap_DC_LogicalToDeviceYRel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_CanDrawBitmap", (PyCFunction) _wrap_DC_CanDrawBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_CanGetTextExtent", (PyCFunction) _wrap_DC_CanGetTextExtent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetDepth", (PyCFunction) _wrap_DC_GetDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetPPI", (PyCFunction) _wrap_DC_GetPPI, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_Ok", (PyCFunction) _wrap_DC_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetBackgroundMode", (PyCFunction) _wrap_DC_GetBackgroundMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetBackground", (PyCFunction) _wrap_DC_GetBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetBrush", (PyCFunction) _wrap_DC_GetBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetFont", (PyCFunction) _wrap_DC_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetPen", (PyCFunction) _wrap_DC_GetPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetTextBackground", (PyCFunction) _wrap_DC_GetTextBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetTextForeground", (PyCFunction) _wrap_DC_GetTextForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetTextForeground", (PyCFunction) _wrap_DC_SetTextForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetTextBackground", (PyCFunction) _wrap_DC_SetTextBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetMapMode", (PyCFunction) _wrap_DC_GetMapMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetMapMode", (PyCFunction) _wrap_DC_SetMapMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetUserScale", (PyCFunction) _wrap_DC_GetUserScale, 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_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_SetLogicalOriginPoint", (PyCFunction) _wrap_DC_SetLogicalOriginPoint, 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_SetDeviceOriginPoint", (PyCFunction) _wrap_DC_SetDeviceOriginPoint, 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_SetLogicalFunction", (PyCFunction) _wrap_DC_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_SetOptimization", (PyCFunction) _wrap_DC_SetOptimization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetOptimization", (PyCFunction) _wrap_DC_GetOptimization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_CalcBoundingBox", (PyCFunction) _wrap_DC_CalcBoundingBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_CalcBoundingBoxPoint", (PyCFunction) _wrap_DC_CalcBoundingBoxPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_ResetBoundingBox", (PyCFunction) _wrap_DC_ResetBoundingBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_MinX", (PyCFunction) _wrap_DC_MinX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_MaxX", (PyCFunction) _wrap_DC_MaxX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_MinY", (PyCFunction) _wrap_DC_MinY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_MaxY", (PyCFunction) _wrap_DC_MaxY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_GetBoundingBox", (PyCFunction) _wrap_DC_GetBoundingBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC__DrawPointList", (PyCFunction) _wrap_DC__DrawPointList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC__DrawLineList", (PyCFunction) _wrap_DC__DrawLineList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC__DrawRectangleList", (PyCFunction) _wrap_DC__DrawRectangleList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC__DrawEllipseList", (PyCFunction) _wrap_DC__DrawEllipseList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC__DrawPolygonList", (PyCFunction) _wrap_DC__DrawPolygonList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC__DrawTextList", (PyCFunction) _wrap_DC__DrawTextList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DC_swigregister", DC_swigregister, METH_VARARGS },
-        { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS },
-        { (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", _wrap_new_BufferedDC, 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 *)"BufferedPaintDC_swigregister", BufferedPaintDC_swigregister, METH_VARARGS },
-        { (char *)"new_ScreenDC", (PyCFunction) _wrap_new_ScreenDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScreenDC_EndDrawingOnTop", (PyCFunction) _wrap_ScreenDC_EndDrawingOnTop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScreenDC_swigregister", ScreenDC_swigregister, METH_VARARGS },
-        { (char *)"new_ClientDC", (PyCFunction) _wrap_new_ClientDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ClientDC_swigregister", ClientDC_swigregister, METH_VARARGS },
-        { (char *)"new_PaintDC", (PyCFunction) _wrap_new_PaintDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PaintDC_swigregister", PaintDC_swigregister, METH_VARARGS },
-        { (char *)"new_WindowDC", (PyCFunction) _wrap_new_WindowDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WindowDC_swigregister", WindowDC_swigregister, METH_VARARGS },
-        { (char *)"new_MirrorDC", (PyCFunction) _wrap_new_MirrorDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MirrorDC_swigregister", MirrorDC_swigregister, METH_VARARGS },
-        { (char *)"new_PostScriptDC", (PyCFunction) _wrap_new_PostScriptDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PostScriptDC_GetPrintData", (PyCFunction) _wrap_PostScriptDC_GetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PostScriptDC_SetPrintData", (PyCFunction) _wrap_PostScriptDC_SetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PostScriptDC_SetResolution", (PyCFunction) _wrap_PostScriptDC_SetResolution, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PostScriptDC_GetResolution", (PyCFunction) _wrap_PostScriptDC_GetResolution, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PostScriptDC_swigregister", PostScriptDC_swigregister, METH_VARARGS },
-        { (char *)"new_MetaFile", (PyCFunction) _wrap_new_MetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_MetaFile", (PyCFunction) _wrap_delete_MetaFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFile_Ok", (PyCFunction) _wrap_MetaFile_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFile_SetClipboard", (PyCFunction) _wrap_MetaFile_SetClipboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFile_GetSize", (PyCFunction) _wrap_MetaFile_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFile_GetWidth", (PyCFunction) _wrap_MetaFile_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFile_GetHeight", (PyCFunction) _wrap_MetaFile_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFile_swigregister", MetaFile_swigregister, METH_VARARGS },
-        { (char *)"new_MetaFileDC", (PyCFunction) _wrap_new_MetaFileDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFileDC_Close", (PyCFunction) _wrap_MetaFileDC_Close, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetaFileDC_swigregister", MetaFileDC_swigregister, METH_VARARGS },
-        { (char *)"new_PrinterDC", (PyCFunction) _wrap_new_PrinterDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrinterDC_swigregister", PrinterDC_swigregister, METH_VARARGS },
-        { (char *)"new_ImageList", (PyCFunction) _wrap_new_ImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ImageList", (PyCFunction) _wrap_delete_ImageList, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_Add", (PyCFunction) _wrap_ImageList_Add, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_AddWithColourMask", (PyCFunction) _wrap_ImageList_AddWithColourMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_AddIcon", (PyCFunction) _wrap_ImageList_AddIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_Replace", (PyCFunction) _wrap_ImageList_Replace, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_Draw", (PyCFunction) _wrap_ImageList_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_GetImageCount", (PyCFunction) _wrap_ImageList_GetImageCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_Remove", (PyCFunction) _wrap_ImageList_Remove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_RemoveAll", (PyCFunction) _wrap_ImageList_RemoveAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_GetSize", (PyCFunction) _wrap_ImageList_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ImageList_swigregister", ImageList_swigregister, METH_VARARGS },
-        { (char *)"PenList_AddPen", (PyCFunction) _wrap_PenList_AddPen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PenList_FindOrCreatePen", (PyCFunction) _wrap_PenList_FindOrCreatePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PenList_RemovePen", (PyCFunction) _wrap_PenList_RemovePen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PenList_GetCount", (PyCFunction) _wrap_PenList_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PenList_swigregister", PenList_swigregister, METH_VARARGS },
-        { (char *)"BrushList_AddBrush", (PyCFunction) _wrap_BrushList_AddBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BrushList_FindOrCreateBrush", (PyCFunction) _wrap_BrushList_FindOrCreateBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BrushList_RemoveBrush", (PyCFunction) _wrap_BrushList_RemoveBrush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BrushList_GetCount", (PyCFunction) _wrap_BrushList_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BrushList_swigregister", BrushList_swigregister, METH_VARARGS },
-        { (char *)"new_ColourDatabase", (PyCFunction) _wrap_new_ColourDatabase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ColourDatabase", (PyCFunction) _wrap_delete_ColourDatabase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDatabase_Find", (PyCFunction) _wrap_ColourDatabase_Find, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDatabase_FindName", (PyCFunction) _wrap_ColourDatabase_FindName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDatabase_AddColour", (PyCFunction) _wrap_ColourDatabase_AddColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDatabase_Append", (PyCFunction) _wrap_ColourDatabase_Append, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDatabase_swigregister", ColourDatabase_swigregister, METH_VARARGS },
-        { (char *)"FontList_AddFont", (PyCFunction) _wrap_FontList_AddFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontList_FindOrCreateFont", (PyCFunction) _wrap_FontList_FindOrCreateFont, METH_VARARGS | METH_KEYWORDS },
-        { (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_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 *)"Effects_GetFaceColour", (PyCFunction) _wrap_Effects_GetFaceColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_GetMediumShadow", (PyCFunction) _wrap_Effects_GetMediumShadow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_GetDarkShadow", (PyCFunction) _wrap_Effects_GetDarkShadow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_SetHighlightColour", (PyCFunction) _wrap_Effects_SetHighlightColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_SetLightShadow", (PyCFunction) _wrap_Effects_SetLightShadow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_SetFaceColour", (PyCFunction) _wrap_Effects_SetFaceColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_SetMediumShadow", (PyCFunction) _wrap_Effects_SetMediumShadow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_SetDarkShadow", (PyCFunction) _wrap_Effects_SetDarkShadow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_Set", (PyCFunction) _wrap_Effects_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_DrawSunkenEdge", (PyCFunction) _wrap_Effects_DrawSunkenEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_TileBitmap", (PyCFunction) _wrap_Effects_TileBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Effects_swigregister", Effects_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_GDIObject", (PyCFunction) _wrap_new_GDIObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_GDIObject", (PyCFunction) _wrap_delete_GDIObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GDIObject_GetVisible", (PyCFunction) _wrap_GDIObject_GetVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GDIObject_SetVisible", (PyCFunction) _wrap_GDIObject_SetVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GDIObject_IsNull", (PyCFunction) _wrap_GDIObject_IsNull, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GDIObject_swigregister", GDIObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Colour", (PyCFunction) _wrap_new_Colour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_NamedColour", (PyCFunction) _wrap_new_NamedColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ColourRGB", (PyCFunction) _wrap_new_ColourRGB, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Colour", (PyCFunction) _wrap_delete_Colour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_Red", (PyCFunction) _wrap_Colour_Red, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_Green", (PyCFunction) _wrap_Colour_Green, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_Blue", (PyCFunction) _wrap_Colour_Blue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_Ok", (PyCFunction) _wrap_Colour_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_SetFromName", (PyCFunction) _wrap_Colour_SetFromName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_GetPixel", (PyCFunction) _wrap_Colour_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_Get", (PyCFunction) _wrap_Colour_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_GetRGB", (PyCFunction) _wrap_Colour_GetRGB, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Colour_swigregister", Colour_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Palette", (PyCFunction) _wrap_new_Palette, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Palette", (PyCFunction) _wrap_delete_Palette, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Palette_GetPixel", (PyCFunction) _wrap_Palette_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Palette_GetRGB", (PyCFunction) _wrap_Palette_GetRGB, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Palette_Ok", (PyCFunction) _wrap_Palette_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Palette_swigregister", Palette_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Pen", (PyCFunction) _wrap_new_Pen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Pen", (PyCFunction) _wrap_delete_Pen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_GetCap", (PyCFunction) _wrap_Pen_GetCap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_GetColour", (PyCFunction) _wrap_Pen_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_GetJoin", (PyCFunction) _wrap_Pen_GetJoin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_GetStyle", (PyCFunction) _wrap_Pen_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_GetWidth", (PyCFunction) _wrap_Pen_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_Ok", (PyCFunction) _wrap_Pen_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_SetCap", (PyCFunction) _wrap_Pen_SetCap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_SetColour", (PyCFunction) _wrap_Pen_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_SetJoin", (PyCFunction) _wrap_Pen_SetJoin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_SetStyle", (PyCFunction) _wrap_Pen_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen__SetDashes", (PyCFunction) _wrap_Pen__SetDashes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen___ne__", (PyCFunction) _wrap_Pen___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Pen_swigregister", Pen_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Brush", (PyCFunction) _wrap_new_Brush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Brush", (PyCFunction) _wrap_delete_Brush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_SetColour", (PyCFunction) _wrap_Brush_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_SetStyle", (PyCFunction) _wrap_Brush_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_SetStipple", (PyCFunction) _wrap_Brush_SetStipple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_GetColour", (PyCFunction) _wrap_Brush_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_GetStyle", (PyCFunction) _wrap_Brush_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_GetStipple", (PyCFunction) _wrap_Brush_GetStipple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_Ok", (PyCFunction) _wrap_Brush_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_MacGetTheme", (PyCFunction) _wrap_Brush_MacGetTheme, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_MacSetTheme", (PyCFunction) _wrap_Brush_MacSetTheme, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Brush_swigregister", Brush_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Bitmap", (PyCFunction) _wrap_new_Bitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Bitmap", (PyCFunction) _wrap_delete_Bitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_EmptyBitmap", (PyCFunction) _wrap_new_EmptyBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_BitmapFromIcon", (PyCFunction) _wrap_new_BitmapFromIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_BitmapFromImage", (PyCFunction) _wrap_new_BitmapFromImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_BitmapFromXPMData", (PyCFunction) _wrap_new_BitmapFromXPMData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_BitmapFromBits", (PyCFunction) _wrap_new_BitmapFromBits, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_Ok", (PyCFunction) _wrap_Bitmap_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_GetWidth", (PyCFunction) _wrap_Bitmap_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_GetHeight", (PyCFunction) _wrap_Bitmap_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_GetDepth", (PyCFunction) _wrap_Bitmap_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_GetSize", (PyCFunction) _wrap_Bitmap_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_ConvertToImage", (PyCFunction) _wrap_Bitmap_ConvertToImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_GetMask", (PyCFunction) _wrap_Bitmap_GetMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SetMask", (PyCFunction) _wrap_Bitmap_SetMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SetMaskColour", (PyCFunction) _wrap_Bitmap_SetMaskColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_GetSubBitmap", (PyCFunction) _wrap_Bitmap_GetSubBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SaveFile", (PyCFunction) _wrap_Bitmap_SaveFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_LoadFile", (PyCFunction) _wrap_Bitmap_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_CopyFromIcon", (PyCFunction) _wrap_Bitmap_CopyFromIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SetHeight", (PyCFunction) _wrap_Bitmap_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SetWidth", (PyCFunction) _wrap_Bitmap_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Icon", (PyCFunction) _wrap_new_Icon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Icon", (PyCFunction) _wrap_delete_Icon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_EmptyIcon", (PyCFunction) _wrap_new_EmptyIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_IconFromLocation", (PyCFunction) _wrap_new_IconFromLocation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_IconFromBitmap", (PyCFunction) _wrap_new_IconFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_IconFromXPMData", (PyCFunction) _wrap_new_IconFromXPMData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_Ok", (PyCFunction) _wrap_Icon_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_GetWidth", (PyCFunction) _wrap_Icon_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_GetHeight", (PyCFunction) _wrap_Icon_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_GetDepth", (PyCFunction) _wrap_Icon_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_SetWidth", (PyCFunction) _wrap_Icon_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_SetHeight", (PyCFunction) _wrap_Icon_SetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_SetDepth", (PyCFunction) _wrap_Icon_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_CopyFromBitmap", (PyCFunction) _wrap_Icon_CopyFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Icon_swigregister", Icon_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_IconLocation", (PyCFunction) _wrap_new_IconLocation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_IconLocation", (PyCFunction) _wrap_delete_IconLocation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconLocation_IsOk", (PyCFunction) _wrap_IconLocation_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconLocation_SetFileName", (PyCFunction) _wrap_IconLocation_SetFileName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconLocation_GetFileName", (PyCFunction) _wrap_IconLocation_GetFileName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconLocation_SetIndex", (PyCFunction) _wrap_IconLocation_SetIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconLocation_GetIndex", (PyCFunction) _wrap_IconLocation_GetIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconLocation_swigregister", IconLocation_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_IconBundle", (PyCFunction) _wrap_new_IconBundle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_IconBundleFromFile", (PyCFunction) _wrap_new_IconBundleFromFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_IconBundleFromIcon", (PyCFunction) _wrap_new_IconBundleFromIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_IconBundle", (PyCFunction) _wrap_delete_IconBundle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconBundle_AddIcon", (PyCFunction) _wrap_IconBundle_AddIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconBundle_AddIconFromFile", (PyCFunction) _wrap_IconBundle_AddIconFromFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconBundle_GetIcon", (PyCFunction) _wrap_IconBundle_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IconBundle_swigregister", IconBundle_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Cursor", (PyCFunction) _wrap_new_Cursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Cursor", (PyCFunction) _wrap_delete_Cursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_StockCursor", (PyCFunction) _wrap_new_StockCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_CursorFromImage", (PyCFunction) _wrap_new_CursorFromImage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Cursor_Ok", (PyCFunction) _wrap_Cursor_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Cursor_swigregister", Cursor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Region", (PyCFunction) _wrap_new_Region, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_RegionFromBitmap", (PyCFunction) _wrap_new_RegionFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_RegionFromBitmapColour", (PyCFunction) _wrap_new_RegionFromBitmapColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_RegionFromPoints", (PyCFunction) _wrap_new_RegionFromPoints, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Region", (PyCFunction) _wrap_delete_Region, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_Clear", (PyCFunction) _wrap_Region_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_Contains", (PyCFunction) _wrap_Region_Contains, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_ContainsPoint", (PyCFunction) _wrap_Region_ContainsPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_ContainsRect", (PyCFunction) _wrap_Region_ContainsRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_ContainsRectDim", (PyCFunction) _wrap_Region_ContainsRectDim, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_GetBox", (PyCFunction) _wrap_Region_GetBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_Intersect", (PyCFunction) _wrap_Region_Intersect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_IntersectRect", (PyCFunction) _wrap_Region_IntersectRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_IntersectRegion", (PyCFunction) _wrap_Region_IntersectRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_IsEmpty", (PyCFunction) _wrap_Region_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_Union", (PyCFunction) _wrap_Region_Union, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_UnionRect", (PyCFunction) _wrap_Region_UnionRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_UnionRegion", (PyCFunction) _wrap_Region_UnionRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_Subtract", (PyCFunction) _wrap_Region_Subtract, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_SubtractRect", (PyCFunction) _wrap_Region_SubtractRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_SubtractRegion", (PyCFunction) _wrap_Region_SubtractRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_Xor", (PyCFunction) _wrap_Region_Xor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_XorRect", (PyCFunction) _wrap_Region_XorRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_XorRegion", (PyCFunction) _wrap_Region_XorRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_ConvertToBitmap", (PyCFunction) _wrap_Region_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_UnionBitmap", (PyCFunction) _wrap_Region_UnionBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_UnionBitmapColour", (PyCFunction) _wrap_Region_UnionBitmapColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Region_swigregister", Region_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_RegionIterator", (PyCFunction) _wrap_new_RegionIterator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_RegionIterator", (PyCFunction) _wrap_delete_RegionIterator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetX", (PyCFunction) _wrap_RegionIterator_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetY", (PyCFunction) _wrap_RegionIterator_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetW", (PyCFunction) _wrap_RegionIterator_GetW, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetWidth", (PyCFunction) _wrap_RegionIterator_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetH", (PyCFunction) _wrap_RegionIterator_GetH, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetHeight", (PyCFunction) _wrap_RegionIterator_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_GetRect", (PyCFunction) _wrap_RegionIterator_GetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_HaveRects", (PyCFunction) _wrap_RegionIterator_HaveRects, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_Reset", (PyCFunction) _wrap_RegionIterator_Reset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_Next", (PyCFunction) _wrap_RegionIterator_Next, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator___nonzero__", (PyCFunction) _wrap_RegionIterator___nonzero__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegionIterator_swigregister", RegionIterator_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_NativeFontInfo", (PyCFunction) _wrap_new_NativeFontInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_NativeFontInfo", (PyCFunction) _wrap_delete_NativeFontInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_Init", (PyCFunction) _wrap_NativeFontInfo_Init, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_InitFromFont", (PyCFunction) _wrap_NativeFontInfo_InitFromFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetPointSize", (PyCFunction) _wrap_NativeFontInfo_GetPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetStyle", (PyCFunction) _wrap_NativeFontInfo_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetWeight", (PyCFunction) _wrap_NativeFontInfo_GetWeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetUnderlined", (PyCFunction) _wrap_NativeFontInfo_GetUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetFaceName", (PyCFunction) _wrap_NativeFontInfo_GetFaceName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetFamily", (PyCFunction) _wrap_NativeFontInfo_GetFamily, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_GetEncoding", (PyCFunction) _wrap_NativeFontInfo_GetEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetPointSize", (PyCFunction) _wrap_NativeFontInfo_SetPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetStyle", (PyCFunction) _wrap_NativeFontInfo_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetWeight", (PyCFunction) _wrap_NativeFontInfo_SetWeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetUnderlined", (PyCFunction) _wrap_NativeFontInfo_SetUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetFaceName", (PyCFunction) _wrap_NativeFontInfo_SetFaceName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetFamily", (PyCFunction) _wrap_NativeFontInfo_SetFamily, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_SetEncoding", (PyCFunction) _wrap_NativeFontInfo_SetEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_FromString", (PyCFunction) _wrap_NativeFontInfo_FromString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_ToString", (PyCFunction) _wrap_NativeFontInfo_ToString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo___str__", (PyCFunction) _wrap_NativeFontInfo___str__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_FromUserString", (PyCFunction) _wrap_NativeFontInfo_FromUserString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_ToUserString", (PyCFunction) _wrap_NativeFontInfo_ToUserString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeFontInfo_swigregister", NativeFontInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"NativeEncodingInfo_facename_set", (PyCFunction) _wrap_NativeEncodingInfo_facename_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeEncodingInfo_facename_get", (PyCFunction) _wrap_NativeEncodingInfo_facename_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeEncodingInfo_encoding_set", (PyCFunction) _wrap_NativeEncodingInfo_encoding_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeEncodingInfo_encoding_get", (PyCFunction) _wrap_NativeEncodingInfo_encoding_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_NativeEncodingInfo", (PyCFunction) _wrap_new_NativeEncodingInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_NativeEncodingInfo", (PyCFunction) _wrap_delete_NativeEncodingInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeEncodingInfo_FromString", (PyCFunction) _wrap_NativeEncodingInfo_FromString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeEncodingInfo_ToString", (PyCFunction) _wrap_NativeEncodingInfo_ToString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"NativeEncodingInfo_swigregister", NativeEncodingInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"GetNativeFontEncoding", (PyCFunction) _wrap_GetNativeFontEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TestFontEncoding", (PyCFunction) _wrap_TestFontEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_FontMapper", (PyCFunction) _wrap_new_FontMapper, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FontMapper", (PyCFunction) _wrap_delete_FontMapper, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_Get", (PyCFunction) _wrap_FontMapper_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_Set", (PyCFunction) _wrap_FontMapper_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_CharsetToEncoding", (PyCFunction) _wrap_FontMapper_CharsetToEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetSupportedEncodingsCount", (PyCFunction) _wrap_FontMapper_GetSupportedEncodingsCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetEncoding", (PyCFunction) _wrap_FontMapper_GetEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetEncodingName", (PyCFunction) _wrap_FontMapper_GetEncodingName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetEncodingDescription", (PyCFunction) _wrap_FontMapper_GetEncodingDescription, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetEncodingFromName", (PyCFunction) _wrap_FontMapper_GetEncodingFromName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_SetConfig", (PyCFunction) _wrap_FontMapper_SetConfig, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_SetConfigPath", (PyCFunction) _wrap_FontMapper_SetConfigPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetDefaultConfigPath", (PyCFunction) _wrap_FontMapper_GetDefaultConfigPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_GetAltForEncoding", (PyCFunction) _wrap_FontMapper_GetAltForEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_IsEncodingAvailable", (PyCFunction) _wrap_FontMapper_IsEncodingAvailable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_SetDialogParent", (PyCFunction) _wrap_FontMapper_SetDialogParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_SetDialogTitle", (PyCFunction) _wrap_FontMapper_SetDialogTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontMapper_swigregister", FontMapper_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Font", (PyCFunction) _wrap_new_Font, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Font", (PyCFunction) _wrap_delete_Font, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_FontFromNativeInfo", (PyCFunction) _wrap_new_FontFromNativeInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_FontFromNativeInfoString", (PyCFunction) _wrap_new_FontFromNativeInfoString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Font2", (PyCFunction) _wrap_new_Font2, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_Ok", (PyCFunction) _wrap_Font_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font___eq__", (PyCFunction) _wrap_Font___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font___ne__", (PyCFunction) _wrap_Font___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetPointSize", (PyCFunction) _wrap_Font_GetPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetFamily", (PyCFunction) _wrap_Font_GetFamily, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetStyle", (PyCFunction) _wrap_Font_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetWeight", (PyCFunction) _wrap_Font_GetWeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetUnderlined", (PyCFunction) _wrap_Font_GetUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetFaceName", (PyCFunction) _wrap_Font_GetFaceName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetEncoding", (PyCFunction) _wrap_Font_GetEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetNativeFontInfo", (PyCFunction) _wrap_Font_GetNativeFontInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_IsFixedWidth", (PyCFunction) _wrap_Font_IsFixedWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetNativeFontInfoDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetPointSize", (PyCFunction) _wrap_Font_SetPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetFamily", (PyCFunction) _wrap_Font_SetFamily, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetStyle", (PyCFunction) _wrap_Font_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetWeight", (PyCFunction) _wrap_Font_SetWeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetFaceName", (PyCFunction) _wrap_Font_SetFaceName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetUnderlined", (PyCFunction) _wrap_Font_SetUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetEncoding", (PyCFunction) _wrap_Font_SetEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetNativeFontInfo", (PyCFunction) _wrap_Font_SetNativeFontInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetNativeFontInfoFromString", (PyCFunction) _wrap_Font_SetNativeFontInfoFromString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetNativeFontInfoUserDesc", (PyCFunction) _wrap_Font_SetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetFamilyString", (PyCFunction) _wrap_Font_GetFamilyString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetStyleString", (PyCFunction) _wrap_Font_GetStyleString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetWeightString", (PyCFunction) _wrap_Font_GetWeightString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetNoAntiAliasing", (PyCFunction) _wrap_Font_SetNoAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetNoAntiAliasing", (PyCFunction) _wrap_Font_GetNoAntiAliasing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_GetDefaultEncoding", (PyCFunction) _wrap_Font_GetDefaultEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_SetDefaultEncoding", (PyCFunction) _wrap_Font_SetDefaultEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Font_swigregister", Font_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FontEnumerator", (PyCFunction) _wrap_new_FontEnumerator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FontEnumerator", (PyCFunction) _wrap_delete_FontEnumerator, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontEnumerator__setCallbackInfo", (PyCFunction) _wrap_FontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_FontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_FontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontEnumerator_GetEncodings", (PyCFunction) _wrap_FontEnumerator_GetEncodings, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontEnumerator_GetFacenames", (PyCFunction) _wrap_FontEnumerator_GetFacenames, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontEnumerator_swigregister", FontEnumerator_swigregister, METH_VARARGS, NULL },
+        { (char *)"LanguageInfo_Language_set", (PyCFunction) _wrap_LanguageInfo_Language_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LanguageInfo_Language_get", (PyCFunction) _wrap_LanguageInfo_Language_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LanguageInfo_CanonicalName_set", (PyCFunction) _wrap_LanguageInfo_CanonicalName_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LanguageInfo_CanonicalName_get", (PyCFunction) _wrap_LanguageInfo_CanonicalName_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LanguageInfo_Description_set", (PyCFunction) _wrap_LanguageInfo_Description_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LanguageInfo_Description_get", (PyCFunction) _wrap_LanguageInfo_Description_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LanguageInfo_swigregister", LanguageInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Locale", (PyCFunction) _wrap_new_Locale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Locale", (PyCFunction) _wrap_delete_Locale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_Init1", (PyCFunction) _wrap_Locale_Init1, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_Init2", (PyCFunction) _wrap_Locale_Init2, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetSystemLanguage", (PyCFunction) _wrap_Locale_GetSystemLanguage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetSystemEncoding", (PyCFunction) _wrap_Locale_GetSystemEncoding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetSystemEncodingName", (PyCFunction) _wrap_Locale_GetSystemEncodingName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_IsOk", (PyCFunction) _wrap_Locale_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetLocale", (PyCFunction) _wrap_Locale_GetLocale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetLanguage", (PyCFunction) _wrap_Locale_GetLanguage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetSysName", (PyCFunction) _wrap_Locale_GetSysName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetCanonicalName", (PyCFunction) _wrap_Locale_GetCanonicalName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_AddCatalogLookupPathPrefix", (PyCFunction) _wrap_Locale_AddCatalogLookupPathPrefix, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_AddCatalog", (PyCFunction) _wrap_Locale_AddCatalog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_IsLoaded", (PyCFunction) _wrap_Locale_IsLoaded, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetLanguageInfo", (PyCFunction) _wrap_Locale_GetLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetLanguageName", (PyCFunction) _wrap_Locale_GetLanguageName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_FindLanguageInfo", (PyCFunction) _wrap_Locale_FindLanguageInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_AddLanguage", (PyCFunction) _wrap_Locale_AddLanguage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetString", (PyCFunction) _wrap_Locale_GetString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_GetName", (PyCFunction) _wrap_Locale_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Locale_swigregister", Locale_swigregister, METH_VARARGS, NULL },
+        { (char *)"GetLocale", (PyCFunction) _wrap_GetLocale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetTranslation", _wrap_GetTranslation, METH_VARARGS, NULL },
+        { (char *)"new_EncodingConverter", (PyCFunction) _wrap_new_EncodingConverter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_EncodingConverter", (PyCFunction) _wrap_delete_EncodingConverter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EncodingConverter_Init", (PyCFunction) _wrap_EncodingConverter_Init, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EncodingConverter_Convert", (PyCFunction) _wrap_EncodingConverter_Convert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EncodingConverter_GetPlatformEquivalents", (PyCFunction) _wrap_EncodingConverter_GetPlatformEquivalents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EncodingConverter_GetAllEquivalents", (PyCFunction) _wrap_EncodingConverter_GetAllEquivalents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EncodingConverter_CanConvert", (PyCFunction) _wrap_EncodingConverter_CanConvert, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EncodingConverter_swigregister", EncodingConverter_swigregister, METH_VARARGS, NULL },
+        { (char *)"delete_DC", (PyCFunction) _wrap_delete_DC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_BeginDrawing", (PyCFunction) _wrap_DC_BeginDrawing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_EndDrawing", (PyCFunction) _wrap_DC_EndDrawing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_FloodFill", (PyCFunction) _wrap_DC_FloodFill, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_FloodFillPoint", (PyCFunction) _wrap_DC_FloodFillPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetPixel", (PyCFunction) _wrap_DC_GetPixel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetPixelPoint", (PyCFunction) _wrap_DC_GetPixelPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawLine", (PyCFunction) _wrap_DC_DrawLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawLinePoint", (PyCFunction) _wrap_DC_DrawLinePoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_CrossHair", (PyCFunction) _wrap_DC_CrossHair, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_CrossHairPoint", (PyCFunction) _wrap_DC_CrossHairPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawArc", (PyCFunction) _wrap_DC_DrawArc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawArcPoint", (PyCFunction) _wrap_DC_DrawArcPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawCheckMark", (PyCFunction) _wrap_DC_DrawCheckMark, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawCheckMarkRect", (PyCFunction) _wrap_DC_DrawCheckMarkRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawEllipticArc", (PyCFunction) _wrap_DC_DrawEllipticArc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawEllipticArcPointSize", (PyCFunction) _wrap_DC_DrawEllipticArcPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawPoint", (PyCFunction) _wrap_DC_DrawPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawPointPoint", (PyCFunction) _wrap_DC_DrawPointPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRectangle", (PyCFunction) _wrap_DC_DrawRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRectangleRect", (PyCFunction) _wrap_DC_DrawRectangleRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRectanglePointSize", (PyCFunction) _wrap_DC_DrawRectanglePointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRoundedRectangle", (PyCFunction) _wrap_DC_DrawRoundedRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRoundedRectangleRect", (PyCFunction) _wrap_DC_DrawRoundedRectangleRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRoundedRectanglePointSize", (PyCFunction) _wrap_DC_DrawRoundedRectanglePointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawCircle", (PyCFunction) _wrap_DC_DrawCircle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawCirclePoint", (PyCFunction) _wrap_DC_DrawCirclePoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawEllipse", (PyCFunction) _wrap_DC_DrawEllipse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawEllipseRect", (PyCFunction) _wrap_DC_DrawEllipseRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawEllipsePointSize", (PyCFunction) _wrap_DC_DrawEllipsePointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawIcon", (PyCFunction) _wrap_DC_DrawIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawIconPoint", (PyCFunction) _wrap_DC_DrawIconPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawBitmap", (PyCFunction) _wrap_DC_DrawBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawBitmapPoint", (PyCFunction) _wrap_DC_DrawBitmapPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawText", (PyCFunction) _wrap_DC_DrawText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawTextPoint", (PyCFunction) _wrap_DC_DrawTextPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRotatedText", (PyCFunction) _wrap_DC_DrawRotatedText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawLines", (PyCFunction) _wrap_DC_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawPolygon", (PyCFunction) _wrap_DC_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawLabel", (PyCFunction) _wrap_DC_DrawLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawImageLabel", (PyCFunction) _wrap_DC_DrawImageLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DrawSpline", (PyCFunction) _wrap_DC_DrawSpline, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_Clear", (PyCFunction) _wrap_DC_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_StartDoc", (PyCFunction) _wrap_DC_StartDoc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_EndDoc", (PyCFunction) _wrap_DC_EndDoc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_StartPage", (PyCFunction) _wrap_DC_StartPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_EndPage", (PyCFunction) _wrap_DC_EndPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetFont", (PyCFunction) _wrap_DC_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetPen", (PyCFunction) _wrap_DC_SetPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetBrush", (PyCFunction) _wrap_DC_SetBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetBackground", (PyCFunction) _wrap_DC_SetBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetBackgroundMode", (PyCFunction) _wrap_DC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetPalette", (PyCFunction) _wrap_DC_SetPalette, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DestroyClippingRegion", (PyCFunction) _wrap_DC_DestroyClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetClippingBox", (PyCFunction) _wrap_DC_GetClippingBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetClippingRect", (PyCFunction) _wrap_DC_GetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetCharHeight", (PyCFunction) _wrap_DC_GetCharHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetCharWidth", (PyCFunction) _wrap_DC_GetCharWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetSizeMMTuple", (PyCFunction) _wrap_DC_GetSizeMMTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DeviceToLogicalX", (PyCFunction) _wrap_DC_DeviceToLogicalX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DeviceToLogicalY", (PyCFunction) _wrap_DC_DeviceToLogicalY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DeviceToLogicalXRel", (PyCFunction) _wrap_DC_DeviceToLogicalXRel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_DeviceToLogicalYRel", (PyCFunction) _wrap_DC_DeviceToLogicalYRel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_LogicalToDeviceX", (PyCFunction) _wrap_DC_LogicalToDeviceX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_LogicalToDeviceY", (PyCFunction) _wrap_DC_LogicalToDeviceY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_LogicalToDeviceXRel", (PyCFunction) _wrap_DC_LogicalToDeviceXRel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_LogicalToDeviceYRel", (PyCFunction) _wrap_DC_LogicalToDeviceYRel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_CanDrawBitmap", (PyCFunction) _wrap_DC_CanDrawBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_CanGetTextExtent", (PyCFunction) _wrap_DC_CanGetTextExtent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetDepth", (PyCFunction) _wrap_DC_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetPPI", (PyCFunction) _wrap_DC_GetPPI, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_Ok", (PyCFunction) _wrap_DC_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetBackgroundMode", (PyCFunction) _wrap_DC_GetBackgroundMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetBackground", (PyCFunction) _wrap_DC_GetBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetBrush", (PyCFunction) _wrap_DC_GetBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetFont", (PyCFunction) _wrap_DC_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetPen", (PyCFunction) _wrap_DC_GetPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetTextBackground", (PyCFunction) _wrap_DC_GetTextBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetTextForeground", (PyCFunction) _wrap_DC_GetTextForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetTextForeground", (PyCFunction) _wrap_DC_SetTextForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetTextBackground", (PyCFunction) _wrap_DC_SetTextBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetMapMode", (PyCFunction) _wrap_DC_GetMapMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetMapMode", (PyCFunction) _wrap_DC_SetMapMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetUserScale", (PyCFunction) _wrap_DC_GetUserScale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetUserScale", (PyCFunction) _wrap_DC_SetUserScale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetLogicalScale", (PyCFunction) _wrap_DC_GetLogicalScale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetLogicalScale", (PyCFunction) _wrap_DC_SetLogicalScale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetLogicalOrigin", (PyCFunction) _wrap_DC_GetLogicalOrigin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetLogicalOriginTuple", (PyCFunction) _wrap_DC_GetLogicalOriginTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetLogicalOrigin", (PyCFunction) _wrap_DC_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetLogicalOriginPoint", (PyCFunction) _wrap_DC_SetLogicalOriginPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetDeviceOrigin", (PyCFunction) _wrap_DC_GetDeviceOrigin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetDeviceOriginTuple", (PyCFunction) _wrap_DC_GetDeviceOriginTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetDeviceOrigin", (PyCFunction) _wrap_DC_SetDeviceOrigin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetDeviceOriginPoint", (PyCFunction) _wrap_DC_SetDeviceOriginPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetAxisOrientation", (PyCFunction) _wrap_DC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetLogicalFunction", (PyCFunction) _wrap_DC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetLogicalFunction", (PyCFunction) _wrap_DC_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_SetOptimization", (PyCFunction) _wrap_DC_SetOptimization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetOptimization", (PyCFunction) _wrap_DC_GetOptimization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_CalcBoundingBox", (PyCFunction) _wrap_DC_CalcBoundingBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_CalcBoundingBoxPoint", (PyCFunction) _wrap_DC_CalcBoundingBoxPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_ResetBoundingBox", (PyCFunction) _wrap_DC_ResetBoundingBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_MinX", (PyCFunction) _wrap_DC_MinX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_MaxX", (PyCFunction) _wrap_DC_MaxX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_MinY", (PyCFunction) _wrap_DC_MinY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_MaxY", (PyCFunction) _wrap_DC_MaxY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_GetBoundingBox", (PyCFunction) _wrap_DC_GetBoundingBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC__DrawPointList", (PyCFunction) _wrap_DC__DrawPointList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC__DrawLineList", (PyCFunction) _wrap_DC__DrawLineList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC__DrawRectangleList", (PyCFunction) _wrap_DC__DrawRectangleList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC__DrawEllipseList", (PyCFunction) _wrap_DC__DrawEllipseList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC__DrawPolygonList", (PyCFunction) _wrap_DC__DrawPolygonList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC__DrawTextList", (PyCFunction) _wrap_DC__DrawTextList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DC_swigregister", DC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL },
+        { (char *)"delete_BufferedDC", (PyCFunction) _wrap_delete_BufferedDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BufferedPaintDC_swigregister", BufferedPaintDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ScreenDC", (PyCFunction) _wrap_new_ScreenDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScreenDC_EndDrawingOnTop", (PyCFunction) _wrap_ScreenDC_EndDrawingOnTop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScreenDC_swigregister", ScreenDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ClientDC", (PyCFunction) _wrap_new_ClientDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ClientDC_swigregister", ClientDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PaintDC", (PyCFunction) _wrap_new_PaintDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PaintDC_swigregister", PaintDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_WindowDC", (PyCFunction) _wrap_new_WindowDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WindowDC_swigregister", WindowDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MirrorDC", (PyCFunction) _wrap_new_MirrorDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MirrorDC_swigregister", MirrorDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PostScriptDC", (PyCFunction) _wrap_new_PostScriptDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PostScriptDC_GetPrintData", (PyCFunction) _wrap_PostScriptDC_GetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PostScriptDC_SetPrintData", (PyCFunction) _wrap_PostScriptDC_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PostScriptDC_SetResolution", (PyCFunction) _wrap_PostScriptDC_SetResolution, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PostScriptDC_GetResolution", (PyCFunction) _wrap_PostScriptDC_GetResolution, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PostScriptDC_swigregister", PostScriptDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MetaFile", (PyCFunction) _wrap_new_MetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_MetaFile", (PyCFunction) _wrap_delete_MetaFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFile_Ok", (PyCFunction) _wrap_MetaFile_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFile_SetClipboard", (PyCFunction) _wrap_MetaFile_SetClipboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFile_GetSize", (PyCFunction) _wrap_MetaFile_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFile_GetWidth", (PyCFunction) _wrap_MetaFile_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFile_GetHeight", (PyCFunction) _wrap_MetaFile_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFile_swigregister", MetaFile_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MetaFileDC", (PyCFunction) _wrap_new_MetaFileDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFileDC_Close", (PyCFunction) _wrap_MetaFileDC_Close, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetaFileDC_swigregister", MetaFileDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PrinterDC", (PyCFunction) _wrap_new_PrinterDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrinterDC_swigregister", PrinterDC_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ImageList", (PyCFunction) _wrap_new_ImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ImageList", (PyCFunction) _wrap_delete_ImageList, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_Add", (PyCFunction) _wrap_ImageList_Add, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_AddWithColourMask", (PyCFunction) _wrap_ImageList_AddWithColourMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_AddIcon", (PyCFunction) _wrap_ImageList_AddIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_Replace", (PyCFunction) _wrap_ImageList_Replace, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_Draw", (PyCFunction) _wrap_ImageList_Draw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_GetImageCount", (PyCFunction) _wrap_ImageList_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_Remove", (PyCFunction) _wrap_ImageList_Remove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_RemoveAll", (PyCFunction) _wrap_ImageList_RemoveAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_GetSize", (PyCFunction) _wrap_ImageList_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ImageList_swigregister", ImageList_swigregister, METH_VARARGS, NULL },
+        { (char *)"PenList_AddPen", (PyCFunction) _wrap_PenList_AddPen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PenList_FindOrCreatePen", (PyCFunction) _wrap_PenList_FindOrCreatePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PenList_RemovePen", (PyCFunction) _wrap_PenList_RemovePen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PenList_GetCount", (PyCFunction) _wrap_PenList_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PenList_swigregister", PenList_swigregister, METH_VARARGS, NULL },
+        { (char *)"BrushList_AddBrush", (PyCFunction) _wrap_BrushList_AddBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BrushList_FindOrCreateBrush", (PyCFunction) _wrap_BrushList_FindOrCreateBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BrushList_RemoveBrush", (PyCFunction) _wrap_BrushList_RemoveBrush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BrushList_GetCount", (PyCFunction) _wrap_BrushList_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BrushList_swigregister", BrushList_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ColourDatabase", (PyCFunction) _wrap_new_ColourDatabase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ColourDatabase", (PyCFunction) _wrap_delete_ColourDatabase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDatabase_Find", (PyCFunction) _wrap_ColourDatabase_Find, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDatabase_FindName", (PyCFunction) _wrap_ColourDatabase_FindName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDatabase_AddColour", (PyCFunction) _wrap_ColourDatabase_AddColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDatabase_Append", (PyCFunction) _wrap_ColourDatabase_Append, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDatabase_swigregister", ColourDatabase_swigregister, METH_VARARGS, NULL },
+        { (char *)"FontList_AddFont", (PyCFunction) _wrap_FontList_AddFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontList_FindOrCreateFont", (PyCFunction) _wrap_FontList_FindOrCreateFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontList_RemoveFont", (PyCFunction) _wrap_FontList_RemoveFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontList_GetCount", (PyCFunction) _wrap_FontList_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontList_swigregister", FontList_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Effects", (PyCFunction) _wrap_new_Effects, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_GetHighlightColour", (PyCFunction) _wrap_Effects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_GetLightShadow", (PyCFunction) _wrap_Effects_GetLightShadow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_GetFaceColour", (PyCFunction) _wrap_Effects_GetFaceColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_GetMediumShadow", (PyCFunction) _wrap_Effects_GetMediumShadow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_GetDarkShadow", (PyCFunction) _wrap_Effects_GetDarkShadow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_SetHighlightColour", (PyCFunction) _wrap_Effects_SetHighlightColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_SetLightShadow", (PyCFunction) _wrap_Effects_SetLightShadow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_SetFaceColour", (PyCFunction) _wrap_Effects_SetFaceColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_SetMediumShadow", (PyCFunction) _wrap_Effects_SetMediumShadow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_SetDarkShadow", (PyCFunction) _wrap_Effects_SetDarkShadow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_Set", (PyCFunction) _wrap_Effects_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_DrawSunkenEdge", (PyCFunction) _wrap_Effects_DrawSunkenEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_TileBitmap", (PyCFunction) _wrap_Effects_TileBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Effects_swigregister", Effects_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -19395,7 +19517,7 @@ _swigt__p_wxColourDatabase,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -19421,389 +19543,389 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     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_KOI8_U", SWIG_FromInt((int)wxFONTENCODING_KOI8_U));
-    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));
+    PyDict_SetItemString(d,"OutRegion", SWIG_From_int((int)wxOutRegion));
+    PyDict_SetItemString(d,"PartRegion", SWIG_From_int((int)wxPartRegion));
+    PyDict_SetItemString(d,"InRegion", SWIG_From_int((int)wxInRegion));
+    PyDict_SetItemString(d,"FONTFAMILY_DEFAULT", SWIG_From_int((int)wxFONTFAMILY_DEFAULT));
+    PyDict_SetItemString(d,"FONTFAMILY_DECORATIVE", SWIG_From_int((int)wxFONTFAMILY_DECORATIVE));
+    PyDict_SetItemString(d,"FONTFAMILY_ROMAN", SWIG_From_int((int)wxFONTFAMILY_ROMAN));
+    PyDict_SetItemString(d,"FONTFAMILY_SCRIPT", SWIG_From_int((int)wxFONTFAMILY_SCRIPT));
+    PyDict_SetItemString(d,"FONTFAMILY_SWISS", SWIG_From_int((int)wxFONTFAMILY_SWISS));
+    PyDict_SetItemString(d,"FONTFAMILY_MODERN", SWIG_From_int((int)wxFONTFAMILY_MODERN));
+    PyDict_SetItemString(d,"FONTFAMILY_TELETYPE", SWIG_From_int((int)wxFONTFAMILY_TELETYPE));
+    PyDict_SetItemString(d,"FONTFAMILY_MAX", SWIG_From_int((int)wxFONTFAMILY_MAX));
+    PyDict_SetItemString(d,"FONTFAMILY_UNKNOWN", SWIG_From_int((int)wxFONTFAMILY_UNKNOWN));
+    PyDict_SetItemString(d,"FONTSTYLE_NORMAL", SWIG_From_int((int)wxFONTSTYLE_NORMAL));
+    PyDict_SetItemString(d,"FONTSTYLE_ITALIC", SWIG_From_int((int)wxFONTSTYLE_ITALIC));
+    PyDict_SetItemString(d,"FONTSTYLE_SLANT", SWIG_From_int((int)wxFONTSTYLE_SLANT));
+    PyDict_SetItemString(d,"FONTSTYLE_MAX", SWIG_From_int((int)wxFONTSTYLE_MAX));
+    PyDict_SetItemString(d,"FONTWEIGHT_NORMAL", SWIG_From_int((int)wxFONTWEIGHT_NORMAL));
+    PyDict_SetItemString(d,"FONTWEIGHT_LIGHT", SWIG_From_int((int)wxFONTWEIGHT_LIGHT));
+    PyDict_SetItemString(d,"FONTWEIGHT_BOLD", SWIG_From_int((int)wxFONTWEIGHT_BOLD));
+    PyDict_SetItemString(d,"FONTWEIGHT_MAX", SWIG_From_int((int)wxFONTWEIGHT_MAX));
+    PyDict_SetItemString(d,"FONTFLAG_DEFAULT", SWIG_From_int((int)wxFONTFLAG_DEFAULT));
+    PyDict_SetItemString(d,"FONTFLAG_ITALIC", SWIG_From_int((int)wxFONTFLAG_ITALIC));
+    PyDict_SetItemString(d,"FONTFLAG_SLANT", SWIG_From_int((int)wxFONTFLAG_SLANT));
+    PyDict_SetItemString(d,"FONTFLAG_LIGHT", SWIG_From_int((int)wxFONTFLAG_LIGHT));
+    PyDict_SetItemString(d,"FONTFLAG_BOLD", SWIG_From_int((int)wxFONTFLAG_BOLD));
+    PyDict_SetItemString(d,"FONTFLAG_ANTIALIASED", SWIG_From_int((int)wxFONTFLAG_ANTIALIASED));
+    PyDict_SetItemString(d,"FONTFLAG_NOT_ANTIALIASED", SWIG_From_int((int)wxFONTFLAG_NOT_ANTIALIASED));
+    PyDict_SetItemString(d,"FONTFLAG_UNDERLINED", SWIG_From_int((int)wxFONTFLAG_UNDERLINED));
+    PyDict_SetItemString(d,"FONTFLAG_STRIKETHROUGH", SWIG_From_int((int)wxFONTFLAG_STRIKETHROUGH));
+    PyDict_SetItemString(d,"FONTFLAG_MASK", SWIG_From_int((int)wxFONTFLAG_MASK));
+    PyDict_SetItemString(d,"FONTENCODING_SYSTEM", SWIG_From_int((int)wxFONTENCODING_SYSTEM));
+    PyDict_SetItemString(d,"FONTENCODING_DEFAULT", SWIG_From_int((int)wxFONTENCODING_DEFAULT));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_1", SWIG_From_int((int)wxFONTENCODING_ISO8859_1));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_2", SWIG_From_int((int)wxFONTENCODING_ISO8859_2));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_3", SWIG_From_int((int)wxFONTENCODING_ISO8859_3));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_4", SWIG_From_int((int)wxFONTENCODING_ISO8859_4));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_5", SWIG_From_int((int)wxFONTENCODING_ISO8859_5));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_6", SWIG_From_int((int)wxFONTENCODING_ISO8859_6));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_7", SWIG_From_int((int)wxFONTENCODING_ISO8859_7));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_8", SWIG_From_int((int)wxFONTENCODING_ISO8859_8));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_9", SWIG_From_int((int)wxFONTENCODING_ISO8859_9));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_10", SWIG_From_int((int)wxFONTENCODING_ISO8859_10));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_11", SWIG_From_int((int)wxFONTENCODING_ISO8859_11));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_12", SWIG_From_int((int)wxFONTENCODING_ISO8859_12));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_13", SWIG_From_int((int)wxFONTENCODING_ISO8859_13));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_14", SWIG_From_int((int)wxFONTENCODING_ISO8859_14));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_15", SWIG_From_int((int)wxFONTENCODING_ISO8859_15));
+    PyDict_SetItemString(d,"FONTENCODING_ISO8859_MAX", SWIG_From_int((int)wxFONTENCODING_ISO8859_MAX));
+    PyDict_SetItemString(d,"FONTENCODING_KOI8", SWIG_From_int((int)wxFONTENCODING_KOI8));
+    PyDict_SetItemString(d,"FONTENCODING_KOI8_U", SWIG_From_int((int)wxFONTENCODING_KOI8_U));
+    PyDict_SetItemString(d,"FONTENCODING_ALTERNATIVE", SWIG_From_int((int)wxFONTENCODING_ALTERNATIVE));
+    PyDict_SetItemString(d,"FONTENCODING_BULGARIAN", SWIG_From_int((int)wxFONTENCODING_BULGARIAN));
+    PyDict_SetItemString(d,"FONTENCODING_CP437", SWIG_From_int((int)wxFONTENCODING_CP437));
+    PyDict_SetItemString(d,"FONTENCODING_CP850", SWIG_From_int((int)wxFONTENCODING_CP850));
+    PyDict_SetItemString(d,"FONTENCODING_CP852", SWIG_From_int((int)wxFONTENCODING_CP852));
+    PyDict_SetItemString(d,"FONTENCODING_CP855", SWIG_From_int((int)wxFONTENCODING_CP855));
+    PyDict_SetItemString(d,"FONTENCODING_CP866", SWIG_From_int((int)wxFONTENCODING_CP866));
+    PyDict_SetItemString(d,"FONTENCODING_CP874", SWIG_From_int((int)wxFONTENCODING_CP874));
+    PyDict_SetItemString(d,"FONTENCODING_CP932", SWIG_From_int((int)wxFONTENCODING_CP932));
+    PyDict_SetItemString(d,"FONTENCODING_CP936", SWIG_From_int((int)wxFONTENCODING_CP936));
+    PyDict_SetItemString(d,"FONTENCODING_CP949", SWIG_From_int((int)wxFONTENCODING_CP949));
+    PyDict_SetItemString(d,"FONTENCODING_CP950", SWIG_From_int((int)wxFONTENCODING_CP950));
+    PyDict_SetItemString(d,"FONTENCODING_CP1250", SWIG_From_int((int)wxFONTENCODING_CP1250));
+    PyDict_SetItemString(d,"FONTENCODING_CP1251", SWIG_From_int((int)wxFONTENCODING_CP1251));
+    PyDict_SetItemString(d,"FONTENCODING_CP1252", SWIG_From_int((int)wxFONTENCODING_CP1252));
+    PyDict_SetItemString(d,"FONTENCODING_CP1253", SWIG_From_int((int)wxFONTENCODING_CP1253));
+    PyDict_SetItemString(d,"FONTENCODING_CP1254", SWIG_From_int((int)wxFONTENCODING_CP1254));
+    PyDict_SetItemString(d,"FONTENCODING_CP1255", SWIG_From_int((int)wxFONTENCODING_CP1255));
+    PyDict_SetItemString(d,"FONTENCODING_CP1256", SWIG_From_int((int)wxFONTENCODING_CP1256));
+    PyDict_SetItemString(d,"FONTENCODING_CP1257", SWIG_From_int((int)wxFONTENCODING_CP1257));
+    PyDict_SetItemString(d,"FONTENCODING_CP12_MAX", SWIG_From_int((int)wxFONTENCODING_CP12_MAX));
+    PyDict_SetItemString(d,"FONTENCODING_UTF7", SWIG_From_int((int)wxFONTENCODING_UTF7));
+    PyDict_SetItemString(d,"FONTENCODING_UTF8", SWIG_From_int((int)wxFONTENCODING_UTF8));
+    PyDict_SetItemString(d,"FONTENCODING_EUC_JP", SWIG_From_int((int)wxFONTENCODING_EUC_JP));
+    PyDict_SetItemString(d,"FONTENCODING_UTF16BE", SWIG_From_int((int)wxFONTENCODING_UTF16BE));
+    PyDict_SetItemString(d,"FONTENCODING_UTF16LE", SWIG_From_int((int)wxFONTENCODING_UTF16LE));
+    PyDict_SetItemString(d,"FONTENCODING_UTF32BE", SWIG_From_int((int)wxFONTENCODING_UTF32BE));
+    PyDict_SetItemString(d,"FONTENCODING_UTF32LE", SWIG_From_int((int)wxFONTENCODING_UTF32LE));
+    PyDict_SetItemString(d,"FONTENCODING_MACROMAN", SWIG_From_int((int)wxFONTENCODING_MACROMAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACJAPANESE", SWIG_From_int((int)wxFONTENCODING_MACJAPANESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACCHINESETRAD", SWIG_From_int((int)wxFONTENCODING_MACCHINESETRAD));
+    PyDict_SetItemString(d,"FONTENCODING_MACKOREAN", SWIG_From_int((int)wxFONTENCODING_MACKOREAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACARABIC", SWIG_From_int((int)wxFONTENCODING_MACARABIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACHEBREW", SWIG_From_int((int)wxFONTENCODING_MACHEBREW));
+    PyDict_SetItemString(d,"FONTENCODING_MACGREEK", SWIG_From_int((int)wxFONTENCODING_MACGREEK));
+    PyDict_SetItemString(d,"FONTENCODING_MACCYRILLIC", SWIG_From_int((int)wxFONTENCODING_MACCYRILLIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACDEVANAGARI", SWIG_From_int((int)wxFONTENCODING_MACDEVANAGARI));
+    PyDict_SetItemString(d,"FONTENCODING_MACGURMUKHI", SWIG_From_int((int)wxFONTENCODING_MACGURMUKHI));
+    PyDict_SetItemString(d,"FONTENCODING_MACGUJARATI", SWIG_From_int((int)wxFONTENCODING_MACGUJARATI));
+    PyDict_SetItemString(d,"FONTENCODING_MACORIYA", SWIG_From_int((int)wxFONTENCODING_MACORIYA));
+    PyDict_SetItemString(d,"FONTENCODING_MACBENGALI", SWIG_From_int((int)wxFONTENCODING_MACBENGALI));
+    PyDict_SetItemString(d,"FONTENCODING_MACTAMIL", SWIG_From_int((int)wxFONTENCODING_MACTAMIL));
+    PyDict_SetItemString(d,"FONTENCODING_MACTELUGU", SWIG_From_int((int)wxFONTENCODING_MACTELUGU));
+    PyDict_SetItemString(d,"FONTENCODING_MACKANNADA", SWIG_From_int((int)wxFONTENCODING_MACKANNADA));
+    PyDict_SetItemString(d,"FONTENCODING_MACMALAJALAM", SWIG_From_int((int)wxFONTENCODING_MACMALAJALAM));
+    PyDict_SetItemString(d,"FONTENCODING_MACSINHALESE", SWIG_From_int((int)wxFONTENCODING_MACSINHALESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACBURMESE", SWIG_From_int((int)wxFONTENCODING_MACBURMESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACKHMER", SWIG_From_int((int)wxFONTENCODING_MACKHMER));
+    PyDict_SetItemString(d,"FONTENCODING_MACTHAI", SWIG_From_int((int)wxFONTENCODING_MACTHAI));
+    PyDict_SetItemString(d,"FONTENCODING_MACLAOTIAN", SWIG_From_int((int)wxFONTENCODING_MACLAOTIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACGEORGIAN", SWIG_From_int((int)wxFONTENCODING_MACGEORGIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACARMENIAN", SWIG_From_int((int)wxFONTENCODING_MACARMENIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACCHINESESIMP", SWIG_From_int((int)wxFONTENCODING_MACCHINESESIMP));
+    PyDict_SetItemString(d,"FONTENCODING_MACTIBETAN", SWIG_From_int((int)wxFONTENCODING_MACTIBETAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACMONGOLIAN", SWIG_From_int((int)wxFONTENCODING_MACMONGOLIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACETHIOPIC", SWIG_From_int((int)wxFONTENCODING_MACETHIOPIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACCENTRALEUR", SWIG_From_int((int)wxFONTENCODING_MACCENTRALEUR));
+    PyDict_SetItemString(d,"FONTENCODING_MACVIATNAMESE", SWIG_From_int((int)wxFONTENCODING_MACVIATNAMESE));
+    PyDict_SetItemString(d,"FONTENCODING_MACARABICEXT", SWIG_From_int((int)wxFONTENCODING_MACARABICEXT));
+    PyDict_SetItemString(d,"FONTENCODING_MACSYMBOL", SWIG_From_int((int)wxFONTENCODING_MACSYMBOL));
+    PyDict_SetItemString(d,"FONTENCODING_MACDINGBATS", SWIG_From_int((int)wxFONTENCODING_MACDINGBATS));
+    PyDict_SetItemString(d,"FONTENCODING_MACTURKISH", SWIG_From_int((int)wxFONTENCODING_MACTURKISH));
+    PyDict_SetItemString(d,"FONTENCODING_MACCROATIAN", SWIG_From_int((int)wxFONTENCODING_MACCROATIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACICELANDIC", SWIG_From_int((int)wxFONTENCODING_MACICELANDIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACROMANIAN", SWIG_From_int((int)wxFONTENCODING_MACROMANIAN));
+    PyDict_SetItemString(d,"FONTENCODING_MACCELTIC", SWIG_From_int((int)wxFONTENCODING_MACCELTIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACGAELIC", SWIG_From_int((int)wxFONTENCODING_MACGAELIC));
+    PyDict_SetItemString(d,"FONTENCODING_MACKEYBOARD", SWIG_From_int((int)wxFONTENCODING_MACKEYBOARD));
+    PyDict_SetItemString(d,"FONTENCODING_MACMIN", SWIG_From_int((int)wxFONTENCODING_MACMIN));
+    PyDict_SetItemString(d,"FONTENCODING_MACMAX", SWIG_From_int((int)wxFONTENCODING_MACMAX));
+    PyDict_SetItemString(d,"FONTENCODING_MAX", SWIG_From_int((int)wxFONTENCODING_MAX));
+    PyDict_SetItemString(d,"FONTENCODING_UTF16", SWIG_From_int((int)wxFONTENCODING_UTF16));
+    PyDict_SetItemString(d,"FONTENCODING_UTF32", SWIG_From_int((int)wxFONTENCODING_UTF32));
+    PyDict_SetItemString(d,"FONTENCODING_UNICODE", SWIG_From_int((int)wxFONTENCODING_UNICODE));
+    PyDict_SetItemString(d,"FONTENCODING_GB2312", SWIG_From_int((int)wxFONTENCODING_GB2312));
+    PyDict_SetItemString(d,"FONTENCODING_BIG5", SWIG_From_int((int)wxFONTENCODING_BIG5));
+    PyDict_SetItemString(d,"FONTENCODING_SHIFT_JIS", SWIG_From_int((int)wxFONTENCODING_SHIFT_JIS));
     
     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,"LANGUAGE_DEFAULT", SWIG_From_int((int)wxLANGUAGE_DEFAULT));
+    PyDict_SetItemString(d,"LANGUAGE_UNKNOWN", SWIG_From_int((int)wxLANGUAGE_UNKNOWN));
+    PyDict_SetItemString(d,"LANGUAGE_ABKHAZIAN", SWIG_From_int((int)wxLANGUAGE_ABKHAZIAN));
+    PyDict_SetItemString(d,"LANGUAGE_AFAR", SWIG_From_int((int)wxLANGUAGE_AFAR));
+    PyDict_SetItemString(d,"LANGUAGE_AFRIKAANS", SWIG_From_int((int)wxLANGUAGE_AFRIKAANS));
+    PyDict_SetItemString(d,"LANGUAGE_ALBANIAN", SWIG_From_int((int)wxLANGUAGE_ALBANIAN));
+    PyDict_SetItemString(d,"LANGUAGE_AMHARIC", SWIG_From_int((int)wxLANGUAGE_AMHARIC));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC", SWIG_From_int((int)wxLANGUAGE_ARABIC));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_ALGERIA", SWIG_From_int((int)wxLANGUAGE_ARABIC_ALGERIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_BAHRAIN", SWIG_From_int((int)wxLANGUAGE_ARABIC_BAHRAIN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_EGYPT", SWIG_From_int((int)wxLANGUAGE_ARABIC_EGYPT));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_IRAQ", SWIG_From_int((int)wxLANGUAGE_ARABIC_IRAQ));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_JORDAN", SWIG_From_int((int)wxLANGUAGE_ARABIC_JORDAN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_KUWAIT", SWIG_From_int((int)wxLANGUAGE_ARABIC_KUWAIT));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_LEBANON", SWIG_From_int((int)wxLANGUAGE_ARABIC_LEBANON));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_LIBYA", SWIG_From_int((int)wxLANGUAGE_ARABIC_LIBYA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_MOROCCO", SWIG_From_int((int)wxLANGUAGE_ARABIC_MOROCCO));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_OMAN", SWIG_From_int((int)wxLANGUAGE_ARABIC_OMAN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_QATAR", SWIG_From_int((int)wxLANGUAGE_ARABIC_QATAR));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_SAUDI_ARABIA", SWIG_From_int((int)wxLANGUAGE_ARABIC_SAUDI_ARABIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_SUDAN", SWIG_From_int((int)wxLANGUAGE_ARABIC_SUDAN));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_SYRIA", SWIG_From_int((int)wxLANGUAGE_ARABIC_SYRIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_TUNISIA", SWIG_From_int((int)wxLANGUAGE_ARABIC_TUNISIA));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_UAE", SWIG_From_int((int)wxLANGUAGE_ARABIC_UAE));
+    PyDict_SetItemString(d,"LANGUAGE_ARABIC_YEMEN", SWIG_From_int((int)wxLANGUAGE_ARABIC_YEMEN));
+    PyDict_SetItemString(d,"LANGUAGE_ARMENIAN", SWIG_From_int((int)wxLANGUAGE_ARMENIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ASSAMESE", SWIG_From_int((int)wxLANGUAGE_ASSAMESE));
+    PyDict_SetItemString(d,"LANGUAGE_AYMARA", SWIG_From_int((int)wxLANGUAGE_AYMARA));
+    PyDict_SetItemString(d,"LANGUAGE_AZERI", SWIG_From_int((int)wxLANGUAGE_AZERI));
+    PyDict_SetItemString(d,"LANGUAGE_AZERI_CYRILLIC", SWIG_From_int((int)wxLANGUAGE_AZERI_CYRILLIC));
+    PyDict_SetItemString(d,"LANGUAGE_AZERI_LATIN", SWIG_From_int((int)wxLANGUAGE_AZERI_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_BASHKIR", SWIG_From_int((int)wxLANGUAGE_BASHKIR));
+    PyDict_SetItemString(d,"LANGUAGE_BASQUE", SWIG_From_int((int)wxLANGUAGE_BASQUE));
+    PyDict_SetItemString(d,"LANGUAGE_BELARUSIAN", SWIG_From_int((int)wxLANGUAGE_BELARUSIAN));
+    PyDict_SetItemString(d,"LANGUAGE_BENGALI", SWIG_From_int((int)wxLANGUAGE_BENGALI));
+    PyDict_SetItemString(d,"LANGUAGE_BHUTANI", SWIG_From_int((int)wxLANGUAGE_BHUTANI));
+    PyDict_SetItemString(d,"LANGUAGE_BIHARI", SWIG_From_int((int)wxLANGUAGE_BIHARI));
+    PyDict_SetItemString(d,"LANGUAGE_BISLAMA", SWIG_From_int((int)wxLANGUAGE_BISLAMA));
+    PyDict_SetItemString(d,"LANGUAGE_BRETON", SWIG_From_int((int)wxLANGUAGE_BRETON));
+    PyDict_SetItemString(d,"LANGUAGE_BULGARIAN", SWIG_From_int((int)wxLANGUAGE_BULGARIAN));
+    PyDict_SetItemString(d,"LANGUAGE_BURMESE", SWIG_From_int((int)wxLANGUAGE_BURMESE));
+    PyDict_SetItemString(d,"LANGUAGE_CAMBODIAN", SWIG_From_int((int)wxLANGUAGE_CAMBODIAN));
+    PyDict_SetItemString(d,"LANGUAGE_CATALAN", SWIG_From_int((int)wxLANGUAGE_CATALAN));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE", SWIG_From_int((int)wxLANGUAGE_CHINESE));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_SIMPLIFIED", SWIG_From_int((int)wxLANGUAGE_CHINESE_SIMPLIFIED));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_TRADITIONAL", SWIG_From_int((int)wxLANGUAGE_CHINESE_TRADITIONAL));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_HONGKONG", SWIG_From_int((int)wxLANGUAGE_CHINESE_HONGKONG));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_MACAU", SWIG_From_int((int)wxLANGUAGE_CHINESE_MACAU));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_SINGAPORE", SWIG_From_int((int)wxLANGUAGE_CHINESE_SINGAPORE));
+    PyDict_SetItemString(d,"LANGUAGE_CHINESE_TAIWAN", SWIG_From_int((int)wxLANGUAGE_CHINESE_TAIWAN));
+    PyDict_SetItemString(d,"LANGUAGE_CORSICAN", SWIG_From_int((int)wxLANGUAGE_CORSICAN));
+    PyDict_SetItemString(d,"LANGUAGE_CROATIAN", SWIG_From_int((int)wxLANGUAGE_CROATIAN));
+    PyDict_SetItemString(d,"LANGUAGE_CZECH", SWIG_From_int((int)wxLANGUAGE_CZECH));
+    PyDict_SetItemString(d,"LANGUAGE_DANISH", SWIG_From_int((int)wxLANGUAGE_DANISH));
+    PyDict_SetItemString(d,"LANGUAGE_DUTCH", SWIG_From_int((int)wxLANGUAGE_DUTCH));
+    PyDict_SetItemString(d,"LANGUAGE_DUTCH_BELGIAN", SWIG_From_int((int)wxLANGUAGE_DUTCH_BELGIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH", SWIG_From_int((int)wxLANGUAGE_ENGLISH));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_UK", SWIG_From_int((int)wxLANGUAGE_ENGLISH_UK));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_US", SWIG_From_int((int)wxLANGUAGE_ENGLISH_US));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_AUSTRALIA", SWIG_From_int((int)wxLANGUAGE_ENGLISH_AUSTRALIA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BELIZE", SWIG_From_int((int)wxLANGUAGE_ENGLISH_BELIZE));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_BOTSWANA", SWIG_From_int((int)wxLANGUAGE_ENGLISH_BOTSWANA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CANADA", SWIG_From_int((int)wxLANGUAGE_ENGLISH_CANADA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_CARIBBEAN", SWIG_From_int((int)wxLANGUAGE_ENGLISH_CARIBBEAN));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_DENMARK", SWIG_From_int((int)wxLANGUAGE_ENGLISH_DENMARK));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_EIRE", SWIG_From_int((int)wxLANGUAGE_ENGLISH_EIRE));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_JAMAICA", SWIG_From_int((int)wxLANGUAGE_ENGLISH_JAMAICA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_NEW_ZEALAND", SWIG_From_int((int)wxLANGUAGE_ENGLISH_NEW_ZEALAND));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_PHILIPPINES", SWIG_From_int((int)wxLANGUAGE_ENGLISH_PHILIPPINES));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_SOUTH_AFRICA", SWIG_From_int((int)wxLANGUAGE_ENGLISH_SOUTH_AFRICA));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_TRINIDAD", SWIG_From_int((int)wxLANGUAGE_ENGLISH_TRINIDAD));
+    PyDict_SetItemString(d,"LANGUAGE_ENGLISH_ZIMBABWE", SWIG_From_int((int)wxLANGUAGE_ENGLISH_ZIMBABWE));
+    PyDict_SetItemString(d,"LANGUAGE_ESPERANTO", SWIG_From_int((int)wxLANGUAGE_ESPERANTO));
+    PyDict_SetItemString(d,"LANGUAGE_ESTONIAN", SWIG_From_int((int)wxLANGUAGE_ESTONIAN));
+    PyDict_SetItemString(d,"LANGUAGE_FAEROESE", SWIG_From_int((int)wxLANGUAGE_FAEROESE));
+    PyDict_SetItemString(d,"LANGUAGE_FARSI", SWIG_From_int((int)wxLANGUAGE_FARSI));
+    PyDict_SetItemString(d,"LANGUAGE_FIJI", SWIG_From_int((int)wxLANGUAGE_FIJI));
+    PyDict_SetItemString(d,"LANGUAGE_FINNISH", SWIG_From_int((int)wxLANGUAGE_FINNISH));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH", SWIG_From_int((int)wxLANGUAGE_FRENCH));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_BELGIAN", SWIG_From_int((int)wxLANGUAGE_FRENCH_BELGIAN));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_CANADIAN", SWIG_From_int((int)wxLANGUAGE_FRENCH_CANADIAN));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_LUXEMBOURG", SWIG_From_int((int)wxLANGUAGE_FRENCH_LUXEMBOURG));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_MONACO", SWIG_From_int((int)wxLANGUAGE_FRENCH_MONACO));
+    PyDict_SetItemString(d,"LANGUAGE_FRENCH_SWISS", SWIG_From_int((int)wxLANGUAGE_FRENCH_SWISS));
+    PyDict_SetItemString(d,"LANGUAGE_FRISIAN", SWIG_From_int((int)wxLANGUAGE_FRISIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GALICIAN", SWIG_From_int((int)wxLANGUAGE_GALICIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GEORGIAN", SWIG_From_int((int)wxLANGUAGE_GEORGIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN", SWIG_From_int((int)wxLANGUAGE_GERMAN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_AUSTRIAN", SWIG_From_int((int)wxLANGUAGE_GERMAN_AUSTRIAN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_BELGIUM", SWIG_From_int((int)wxLANGUAGE_GERMAN_BELGIUM));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_LIECHTENSTEIN", SWIG_From_int((int)wxLANGUAGE_GERMAN_LIECHTENSTEIN));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_LUXEMBOURG", SWIG_From_int((int)wxLANGUAGE_GERMAN_LUXEMBOURG));
+    PyDict_SetItemString(d,"LANGUAGE_GERMAN_SWISS", SWIG_From_int((int)wxLANGUAGE_GERMAN_SWISS));
+    PyDict_SetItemString(d,"LANGUAGE_GREEK", SWIG_From_int((int)wxLANGUAGE_GREEK));
+    PyDict_SetItemString(d,"LANGUAGE_GREENLANDIC", SWIG_From_int((int)wxLANGUAGE_GREENLANDIC));
+    PyDict_SetItemString(d,"LANGUAGE_GUARANI", SWIG_From_int((int)wxLANGUAGE_GUARANI));
+    PyDict_SetItemString(d,"LANGUAGE_GUJARATI", SWIG_From_int((int)wxLANGUAGE_GUJARATI));
+    PyDict_SetItemString(d,"LANGUAGE_HAUSA", SWIG_From_int((int)wxLANGUAGE_HAUSA));
+    PyDict_SetItemString(d,"LANGUAGE_HEBREW", SWIG_From_int((int)wxLANGUAGE_HEBREW));
+    PyDict_SetItemString(d,"LANGUAGE_HINDI", SWIG_From_int((int)wxLANGUAGE_HINDI));
+    PyDict_SetItemString(d,"LANGUAGE_HUNGARIAN", SWIG_From_int((int)wxLANGUAGE_HUNGARIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ICELANDIC", SWIG_From_int((int)wxLANGUAGE_ICELANDIC));
+    PyDict_SetItemString(d,"LANGUAGE_INDONESIAN", SWIG_From_int((int)wxLANGUAGE_INDONESIAN));
+    PyDict_SetItemString(d,"LANGUAGE_INTERLINGUA", SWIG_From_int((int)wxLANGUAGE_INTERLINGUA));
+    PyDict_SetItemString(d,"LANGUAGE_INTERLINGUE", SWIG_From_int((int)wxLANGUAGE_INTERLINGUE));
+    PyDict_SetItemString(d,"LANGUAGE_INUKTITUT", SWIG_From_int((int)wxLANGUAGE_INUKTITUT));
+    PyDict_SetItemString(d,"LANGUAGE_INUPIAK", SWIG_From_int((int)wxLANGUAGE_INUPIAK));
+    PyDict_SetItemString(d,"LANGUAGE_IRISH", SWIG_From_int((int)wxLANGUAGE_IRISH));
+    PyDict_SetItemString(d,"LANGUAGE_ITALIAN", SWIG_From_int((int)wxLANGUAGE_ITALIAN));
+    PyDict_SetItemString(d,"LANGUAGE_ITALIAN_SWISS", SWIG_From_int((int)wxLANGUAGE_ITALIAN_SWISS));
+    PyDict_SetItemString(d,"LANGUAGE_JAPANESE", SWIG_From_int((int)wxLANGUAGE_JAPANESE));
+    PyDict_SetItemString(d,"LANGUAGE_JAVANESE", SWIG_From_int((int)wxLANGUAGE_JAVANESE));
+    PyDict_SetItemString(d,"LANGUAGE_KANNADA", SWIG_From_int((int)wxLANGUAGE_KANNADA));
+    PyDict_SetItemString(d,"LANGUAGE_KASHMIRI", SWIG_From_int((int)wxLANGUAGE_KASHMIRI));
+    PyDict_SetItemString(d,"LANGUAGE_KASHMIRI_INDIA", SWIG_From_int((int)wxLANGUAGE_KASHMIRI_INDIA));
+    PyDict_SetItemString(d,"LANGUAGE_KAZAKH", SWIG_From_int((int)wxLANGUAGE_KAZAKH));
+    PyDict_SetItemString(d,"LANGUAGE_KERNEWEK", SWIG_From_int((int)wxLANGUAGE_KERNEWEK));
+    PyDict_SetItemString(d,"LANGUAGE_KINYARWANDA", SWIG_From_int((int)wxLANGUAGE_KINYARWANDA));
+    PyDict_SetItemString(d,"LANGUAGE_KIRGHIZ", SWIG_From_int((int)wxLANGUAGE_KIRGHIZ));
+    PyDict_SetItemString(d,"LANGUAGE_KIRUNDI", SWIG_From_int((int)wxLANGUAGE_KIRUNDI));
+    PyDict_SetItemString(d,"LANGUAGE_KONKANI", SWIG_From_int((int)wxLANGUAGE_KONKANI));
+    PyDict_SetItemString(d,"LANGUAGE_KOREAN", SWIG_From_int((int)wxLANGUAGE_KOREAN));
+    PyDict_SetItemString(d,"LANGUAGE_KURDISH", SWIG_From_int((int)wxLANGUAGE_KURDISH));
+    PyDict_SetItemString(d,"LANGUAGE_LAOTHIAN", SWIG_From_int((int)wxLANGUAGE_LAOTHIAN));
+    PyDict_SetItemString(d,"LANGUAGE_LATIN", SWIG_From_int((int)wxLANGUAGE_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_LATVIAN", SWIG_From_int((int)wxLANGUAGE_LATVIAN));
+    PyDict_SetItemString(d,"LANGUAGE_LINGALA", SWIG_From_int((int)wxLANGUAGE_LINGALA));
+    PyDict_SetItemString(d,"LANGUAGE_LITHUANIAN", SWIG_From_int((int)wxLANGUAGE_LITHUANIAN));
+    PyDict_SetItemString(d,"LANGUAGE_MACEDONIAN", SWIG_From_int((int)wxLANGUAGE_MACEDONIAN));
+    PyDict_SetItemString(d,"LANGUAGE_MALAGASY", SWIG_From_int((int)wxLANGUAGE_MALAGASY));
+    PyDict_SetItemString(d,"LANGUAGE_MALAY", SWIG_From_int((int)wxLANGUAGE_MALAY));
+    PyDict_SetItemString(d,"LANGUAGE_MALAYALAM", SWIG_From_int((int)wxLANGUAGE_MALAYALAM));
+    PyDict_SetItemString(d,"LANGUAGE_MALAY_BRUNEI_DARUSSALAM", SWIG_From_int((int)wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM));
+    PyDict_SetItemString(d,"LANGUAGE_MALAY_MALAYSIA", SWIG_From_int((int)wxLANGUAGE_MALAY_MALAYSIA));
+    PyDict_SetItemString(d,"LANGUAGE_MALTESE", SWIG_From_int((int)wxLANGUAGE_MALTESE));
+    PyDict_SetItemString(d,"LANGUAGE_MANIPURI", SWIG_From_int((int)wxLANGUAGE_MANIPURI));
+    PyDict_SetItemString(d,"LANGUAGE_MAORI", SWIG_From_int((int)wxLANGUAGE_MAORI));
+    PyDict_SetItemString(d,"LANGUAGE_MARATHI", SWIG_From_int((int)wxLANGUAGE_MARATHI));
+    PyDict_SetItemString(d,"LANGUAGE_MOLDAVIAN", SWIG_From_int((int)wxLANGUAGE_MOLDAVIAN));
+    PyDict_SetItemString(d,"LANGUAGE_MONGOLIAN", SWIG_From_int((int)wxLANGUAGE_MONGOLIAN));
+    PyDict_SetItemString(d,"LANGUAGE_NAURU", SWIG_From_int((int)wxLANGUAGE_NAURU));
+    PyDict_SetItemString(d,"LANGUAGE_NEPALI", SWIG_From_int((int)wxLANGUAGE_NEPALI));
+    PyDict_SetItemString(d,"LANGUAGE_NEPALI_INDIA", SWIG_From_int((int)wxLANGUAGE_NEPALI_INDIA));
+    PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_BOKMAL", SWIG_From_int((int)wxLANGUAGE_NORWEGIAN_BOKMAL));
+    PyDict_SetItemString(d,"LANGUAGE_NORWEGIAN_NYNORSK", SWIG_From_int((int)wxLANGUAGE_NORWEGIAN_NYNORSK));
+    PyDict_SetItemString(d,"LANGUAGE_OCCITAN", SWIG_From_int((int)wxLANGUAGE_OCCITAN));
+    PyDict_SetItemString(d,"LANGUAGE_ORIYA", SWIG_From_int((int)wxLANGUAGE_ORIYA));
+    PyDict_SetItemString(d,"LANGUAGE_OROMO", SWIG_From_int((int)wxLANGUAGE_OROMO));
+    PyDict_SetItemString(d,"LANGUAGE_PASHTO", SWIG_From_int((int)wxLANGUAGE_PASHTO));
+    PyDict_SetItemString(d,"LANGUAGE_POLISH", SWIG_From_int((int)wxLANGUAGE_POLISH));
+    PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE", SWIG_From_int((int)wxLANGUAGE_PORTUGUESE));
+    PyDict_SetItemString(d,"LANGUAGE_PORTUGUESE_BRAZILIAN", SWIG_From_int((int)wxLANGUAGE_PORTUGUESE_BRAZILIAN));
+    PyDict_SetItemString(d,"LANGUAGE_PUNJABI", SWIG_From_int((int)wxLANGUAGE_PUNJABI));
+    PyDict_SetItemString(d,"LANGUAGE_QUECHUA", SWIG_From_int((int)wxLANGUAGE_QUECHUA));
+    PyDict_SetItemString(d,"LANGUAGE_RHAETO_ROMANCE", SWIG_From_int((int)wxLANGUAGE_RHAETO_ROMANCE));
+    PyDict_SetItemString(d,"LANGUAGE_ROMANIAN", SWIG_From_int((int)wxLANGUAGE_ROMANIAN));
+    PyDict_SetItemString(d,"LANGUAGE_RUSSIAN", SWIG_From_int((int)wxLANGUAGE_RUSSIAN));
+    PyDict_SetItemString(d,"LANGUAGE_RUSSIAN_UKRAINE", SWIG_From_int((int)wxLANGUAGE_RUSSIAN_UKRAINE));
+    PyDict_SetItemString(d,"LANGUAGE_SAMOAN", SWIG_From_int((int)wxLANGUAGE_SAMOAN));
+    PyDict_SetItemString(d,"LANGUAGE_SANGHO", SWIG_From_int((int)wxLANGUAGE_SANGHO));
+    PyDict_SetItemString(d,"LANGUAGE_SANSKRIT", SWIG_From_int((int)wxLANGUAGE_SANSKRIT));
+    PyDict_SetItemString(d,"LANGUAGE_SCOTS_GAELIC", SWIG_From_int((int)wxLANGUAGE_SCOTS_GAELIC));
+    PyDict_SetItemString(d,"LANGUAGE_SERBIAN", SWIG_From_int((int)wxLANGUAGE_SERBIAN));
+    PyDict_SetItemString(d,"LANGUAGE_SERBIAN_CYRILLIC", SWIG_From_int((int)wxLANGUAGE_SERBIAN_CYRILLIC));
+    PyDict_SetItemString(d,"LANGUAGE_SERBIAN_LATIN", SWIG_From_int((int)wxLANGUAGE_SERBIAN_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_SERBO_CROATIAN", SWIG_From_int((int)wxLANGUAGE_SERBO_CROATIAN));
+    PyDict_SetItemString(d,"LANGUAGE_SESOTHO", SWIG_From_int((int)wxLANGUAGE_SESOTHO));
+    PyDict_SetItemString(d,"LANGUAGE_SETSWANA", SWIG_From_int((int)wxLANGUAGE_SETSWANA));
+    PyDict_SetItemString(d,"LANGUAGE_SHONA", SWIG_From_int((int)wxLANGUAGE_SHONA));
+    PyDict_SetItemString(d,"LANGUAGE_SINDHI", SWIG_From_int((int)wxLANGUAGE_SINDHI));
+    PyDict_SetItemString(d,"LANGUAGE_SINHALESE", SWIG_From_int((int)wxLANGUAGE_SINHALESE));
+    PyDict_SetItemString(d,"LANGUAGE_SISWATI", SWIG_From_int((int)wxLANGUAGE_SISWATI));
+    PyDict_SetItemString(d,"LANGUAGE_SLOVAK", SWIG_From_int((int)wxLANGUAGE_SLOVAK));
+    PyDict_SetItemString(d,"LANGUAGE_SLOVENIAN", SWIG_From_int((int)wxLANGUAGE_SLOVENIAN));
+    PyDict_SetItemString(d,"LANGUAGE_SOMALI", SWIG_From_int((int)wxLANGUAGE_SOMALI));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH", SWIG_From_int((int)wxLANGUAGE_SPANISH));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_ARGENTINA", SWIG_From_int((int)wxLANGUAGE_SPANISH_ARGENTINA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_BOLIVIA", SWIG_From_int((int)wxLANGUAGE_SPANISH_BOLIVIA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_CHILE", SWIG_From_int((int)wxLANGUAGE_SPANISH_CHILE));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_COLOMBIA", SWIG_From_int((int)wxLANGUAGE_SPANISH_COLOMBIA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_COSTA_RICA", SWIG_From_int((int)wxLANGUAGE_SPANISH_COSTA_RICA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_DOMINICAN_REPUBLIC", SWIG_From_int((int)wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_ECUADOR", SWIG_From_int((int)wxLANGUAGE_SPANISH_ECUADOR));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_EL_SALVADOR", SWIG_From_int((int)wxLANGUAGE_SPANISH_EL_SALVADOR));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_GUATEMALA", SWIG_From_int((int)wxLANGUAGE_SPANISH_GUATEMALA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_HONDURAS", SWIG_From_int((int)wxLANGUAGE_SPANISH_HONDURAS));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_MEXICAN", SWIG_From_int((int)wxLANGUAGE_SPANISH_MEXICAN));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_MODERN", SWIG_From_int((int)wxLANGUAGE_SPANISH_MODERN));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_NICARAGUA", SWIG_From_int((int)wxLANGUAGE_SPANISH_NICARAGUA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PANAMA", SWIG_From_int((int)wxLANGUAGE_SPANISH_PANAMA));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PARAGUAY", SWIG_From_int((int)wxLANGUAGE_SPANISH_PARAGUAY));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PERU", SWIG_From_int((int)wxLANGUAGE_SPANISH_PERU));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_PUERTO_RICO", SWIG_From_int((int)wxLANGUAGE_SPANISH_PUERTO_RICO));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_URUGUAY", SWIG_From_int((int)wxLANGUAGE_SPANISH_URUGUAY));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_US", SWIG_From_int((int)wxLANGUAGE_SPANISH_US));
+    PyDict_SetItemString(d,"LANGUAGE_SPANISH_VENEZUELA", SWIG_From_int((int)wxLANGUAGE_SPANISH_VENEZUELA));
+    PyDict_SetItemString(d,"LANGUAGE_SUNDANESE", SWIG_From_int((int)wxLANGUAGE_SUNDANESE));
+    PyDict_SetItemString(d,"LANGUAGE_SWAHILI", SWIG_From_int((int)wxLANGUAGE_SWAHILI));
+    PyDict_SetItemString(d,"LANGUAGE_SWEDISH", SWIG_From_int((int)wxLANGUAGE_SWEDISH));
+    PyDict_SetItemString(d,"LANGUAGE_SWEDISH_FINLAND", SWIG_From_int((int)wxLANGUAGE_SWEDISH_FINLAND));
+    PyDict_SetItemString(d,"LANGUAGE_TAGALOG", SWIG_From_int((int)wxLANGUAGE_TAGALOG));
+    PyDict_SetItemString(d,"LANGUAGE_TAJIK", SWIG_From_int((int)wxLANGUAGE_TAJIK));
+    PyDict_SetItemString(d,"LANGUAGE_TAMIL", SWIG_From_int((int)wxLANGUAGE_TAMIL));
+    PyDict_SetItemString(d,"LANGUAGE_TATAR", SWIG_From_int((int)wxLANGUAGE_TATAR));
+    PyDict_SetItemString(d,"LANGUAGE_TELUGU", SWIG_From_int((int)wxLANGUAGE_TELUGU));
+    PyDict_SetItemString(d,"LANGUAGE_THAI", SWIG_From_int((int)wxLANGUAGE_THAI));
+    PyDict_SetItemString(d,"LANGUAGE_TIBETAN", SWIG_From_int((int)wxLANGUAGE_TIBETAN));
+    PyDict_SetItemString(d,"LANGUAGE_TIGRINYA", SWIG_From_int((int)wxLANGUAGE_TIGRINYA));
+    PyDict_SetItemString(d,"LANGUAGE_TONGA", SWIG_From_int((int)wxLANGUAGE_TONGA));
+    PyDict_SetItemString(d,"LANGUAGE_TSONGA", SWIG_From_int((int)wxLANGUAGE_TSONGA));
+    PyDict_SetItemString(d,"LANGUAGE_TURKISH", SWIG_From_int((int)wxLANGUAGE_TURKISH));
+    PyDict_SetItemString(d,"LANGUAGE_TURKMEN", SWIG_From_int((int)wxLANGUAGE_TURKMEN));
+    PyDict_SetItemString(d,"LANGUAGE_TWI", SWIG_From_int((int)wxLANGUAGE_TWI));
+    PyDict_SetItemString(d,"LANGUAGE_UIGHUR", SWIG_From_int((int)wxLANGUAGE_UIGHUR));
+    PyDict_SetItemString(d,"LANGUAGE_UKRAINIAN", SWIG_From_int((int)wxLANGUAGE_UKRAINIAN));
+    PyDict_SetItemString(d,"LANGUAGE_URDU", SWIG_From_int((int)wxLANGUAGE_URDU));
+    PyDict_SetItemString(d,"LANGUAGE_URDU_INDIA", SWIG_From_int((int)wxLANGUAGE_URDU_INDIA));
+    PyDict_SetItemString(d,"LANGUAGE_URDU_PAKISTAN", SWIG_From_int((int)wxLANGUAGE_URDU_PAKISTAN));
+    PyDict_SetItemString(d,"LANGUAGE_UZBEK", SWIG_From_int((int)wxLANGUAGE_UZBEK));
+    PyDict_SetItemString(d,"LANGUAGE_UZBEK_CYRILLIC", SWIG_From_int((int)wxLANGUAGE_UZBEK_CYRILLIC));
+    PyDict_SetItemString(d,"LANGUAGE_UZBEK_LATIN", SWIG_From_int((int)wxLANGUAGE_UZBEK_LATIN));
+    PyDict_SetItemString(d,"LANGUAGE_VIETNAMESE", SWIG_From_int((int)wxLANGUAGE_VIETNAMESE));
+    PyDict_SetItemString(d,"LANGUAGE_VOLAPUK", SWIG_From_int((int)wxLANGUAGE_VOLAPUK));
+    PyDict_SetItemString(d,"LANGUAGE_WELSH", SWIG_From_int((int)wxLANGUAGE_WELSH));
+    PyDict_SetItemString(d,"LANGUAGE_WOLOF", SWIG_From_int((int)wxLANGUAGE_WOLOF));
+    PyDict_SetItemString(d,"LANGUAGE_XHOSA", SWIG_From_int((int)wxLANGUAGE_XHOSA));
+    PyDict_SetItemString(d,"LANGUAGE_YIDDISH", SWIG_From_int((int)wxLANGUAGE_YIDDISH));
+    PyDict_SetItemString(d,"LANGUAGE_YORUBA", SWIG_From_int((int)wxLANGUAGE_YORUBA));
+    PyDict_SetItemString(d,"LANGUAGE_ZHUANG", SWIG_From_int((int)wxLANGUAGE_ZHUANG));
+    PyDict_SetItemString(d,"LANGUAGE_ZULU", SWIG_From_int((int)wxLANGUAGE_ZULU));
+    PyDict_SetItemString(d,"LANGUAGE_USER_DEFINED", SWIG_From_int((int)wxLANGUAGE_USER_DEFINED));
+    PyDict_SetItemString(d,"LOCALE_CAT_NUMBER", SWIG_From_int((int)wxLOCALE_CAT_NUMBER));
+    PyDict_SetItemString(d,"LOCALE_CAT_DATE", SWIG_From_int((int)wxLOCALE_CAT_DATE));
+    PyDict_SetItemString(d,"LOCALE_CAT_MONEY", SWIG_From_int((int)wxLOCALE_CAT_MONEY));
+    PyDict_SetItemString(d,"LOCALE_CAT_MAX", SWIG_From_int((int)wxLOCALE_CAT_MAX));
+    PyDict_SetItemString(d,"LOCALE_THOUSANDS_SEP", SWIG_From_int((int)wxLOCALE_THOUSANDS_SEP));
+    PyDict_SetItemString(d,"LOCALE_DECIMAL_POINT", SWIG_From_int((int)wxLOCALE_DECIMAL_POINT));
+    PyDict_SetItemString(d,"LOCALE_LOAD_DEFAULT", SWIG_From_int((int)wxLOCALE_LOAD_DEFAULT));
+    PyDict_SetItemString(d,"LOCALE_CONV_ENCODING", SWIG_From_int((int)wxLOCALE_CONV_ENCODING));
+    PyDict_SetItemString(d,"CONVERT_STRICT", SWIG_From_int((int)wxCONVERT_STRICT));
+    PyDict_SetItemString(d,"CONVERT_SUBSTITUTE", SWIG_From_int((int)wxCONVERT_SUBSTITUTE));
+    PyDict_SetItemString(d,"PLATFORM_CURRENT", SWIG_From_int((int)wxPLATFORM_CURRENT));
+    PyDict_SetItemString(d,"PLATFORM_UNIX", SWIG_From_int((int)wxPLATFORM_UNIX));
+    PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_From_int((int)wxPLATFORM_WINDOWS));
+    PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_From_int((int)wxPLATFORM_OS2));
+    PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_From_int((int)wxPLATFORM_MAC));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_From_int((int)wxIMAGELIST_DRAW_NORMAL));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_From_int((int)wxIMAGELIST_DRAW_TRANSPARENT));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_From_int((int)wxIMAGELIST_DRAW_SELECTED));
+    PyDict_SetItemString(d,"IMAGELIST_DRAW_FOCUSED", SWIG_From_int((int)wxIMAGELIST_DRAW_FOCUSED));
+    PyDict_SetItemString(d,"IMAGE_LIST_NORMAL", SWIG_From_int((int)wxIMAGE_LIST_NORMAL));
+    PyDict_SetItemString(d,"IMAGE_LIST_SMALL", SWIG_From_int((int)wxIMAGE_LIST_SMALL));
+    PyDict_SetItemString(d,"IMAGE_LIST_STATE", SWIG_From_int((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);

diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index a65d7e558400edf3248da9447c728a99451add9f..8149f3e255f703d1f137196921f6ad04b86f146d 100644 (file)
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxLogChain swig_types[0] 
@@ -304,47 +306,64 @@ static swig_type_info *swig_types[87];
 
 #define SWIG_name    "_misc_"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -358,68 +377,97 @@ static swig_type_info *swig_types[87];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 
@@ -429,54 +477,90 @@ SWIG_CheckInt(PyObject* obj)
  static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); 
  static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); 
 
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
+{
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
+  }
+  return v;
+}
+
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIG_Check_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  return SWIG_AsVal_long(obj, (long*)0);
+}
+
+
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
+{
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
     return 1;
   }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
 SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIG_As_bool(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIG_Check_bool(PyObject* obj)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
-  }
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -489,40 +573,51 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  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");
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
     }
-    return i;
-  }
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
 
@@ -668,61 +763,89 @@ void wxPyTimer::base_Notify() {
 SWIGSTATICINLINE(PyObject *)
 SWIG_FromCharPtr(const char* cptr)
 { 
-  size_t size = cptr ? strlen(cptr) : 0;
   if (cptr) {
+    size_t size = strlen(cptr);
     if (size > INT_MAX) {
-      return SWIG_NewPointerObj(swig_const_cast(char*,cptr), 
+      return SWIG_NewPointerObj(swig_const_cast(cptr,char*), 
                                SWIG_TypeQuery("char *"), 0);
     } else {
-      return PyString_FromStringAndSize(cptr, swig_numeric_cast(int,size));
+      if (size != 0) {
+       return PyString_FromStringAndSize(cptr, size);
+      } else {
+       return PyString_FromString(cptr);
+      }
     }
-  } else {
-    Py_INCREF(Py_None);
-    return Py_None;
   }
+  Py_INCREF(Py_None);
+  return Py_None;
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
-                             unsigned long max_value) 
+SWIGSTATICINLINE(int)
+  SWIG_CheckUnsignedLongInRange(unsigned long value,
+                               unsigned long max_value,
+                               const char *errmsg) 
 {
-  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);
+  if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' minimum %ld",
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
-}
+  return 1;
+ }
 
 
 #if UINT_MAX != ULONG_MAX
-SWIGSTATICINLINE(unsigned int)
-SWIG_AsUnsignedInt(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 { 
-  return swig_numeric_cast(unsigned int,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned int", UINT_MAX));
+  const char* errmsg = val ? "unsigned int" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned int);
+      return 1;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong
+SWIGSTATICINLINE(unsigned int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedInt(PyObject* obj)
+SWIGSTATICINLINE(unsigned int)
+SWIG_As_unsigned_SS_int(PyObject* obj)
 {
-  SWIG_AsUnsignedInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned int v;
+  if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_int(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0);
 }
 
 wxString Log_TimeStamp(){
@@ -1135,31 +1258,44 @@ long wxConfigBase_ReadInt(wxConfigBase *self,wxString const &key,long defaultVal
             return rv;
         }
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckDouble(PyObject* obj)
+SWIGSTATICINLINE(double)
+SWIG_As_double(PyObject* obj)
 {
-  SWIG_AsDouble(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(double));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
 }
 
 double wxConfigBase_ReadFloat(wxConfigBase *self,wxString const &key,double defaultVal){
@@ -1183,9 +1319,13 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa
 
 
 #if UINT_MAX < LONG_MAX
-#define SWIG_FromUnsignedInt    SWIG_FromLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_long
+/*@@*/
 #else
-#define SWIG_FromUnsignedInt    SWIG_FromUnsignedLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long
+/*@@*/
 #endif
 
 wxDateTime wxDateTime___add____SWIG_0(wxDateTime *self,wxTimeSpan const &other){ return *self + other; }
@@ -1620,7 +1760,7 @@ PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode){
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_SystemSettings_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemSettings_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxColour result;
@@ -1630,7 +1770,7 @@ static PyObject *_wrap_SystemSettings_GetColour(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetColour",kwnames,&obj0)) goto fail;
-    arg1 = (wxSystemColour) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -1651,7 +1791,7 @@ static PyObject *_wrap_SystemSettings_GetColour(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SystemSettings_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemSettings_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxFont result;
@@ -1661,7 +1801,7 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *self, PyObject *args, Py
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetFont",kwnames,&obj0)) goto fail;
-    arg1 = (wxSystemFont) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -1682,7 +1822,7 @@ static PyObject *_wrap_SystemSettings_GetFont(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemSettings_GetMetric(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int result;
@@ -1692,7 +1832,7 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_GetMetric",kwnames,&obj0)) goto fail;
-    arg1 = (wxSystemMetric) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -1702,14 +1842,14 @@ static PyObject *_wrap_SystemSettings_GetMetric(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemSettings_HasFeature(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     bool result;
@@ -1719,7 +1859,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_HasFeature",kwnames,&obj0)) goto fail;
-    arg1 = (wxSystemFeature) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -1738,7 +1878,7 @@ static PyObject *_wrap_SystemSettings_HasFeature(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -1754,14 +1894,14 @@ static PyObject *_wrap_SystemSettings_GetScreenType(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -1770,7 +1910,7 @@ static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *self, PyObject *ar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SystemSettings_SetScreenType",kwnames,&obj0)) goto fail;
-    arg1 = (wxSystemScreenType) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -1787,14 +1927,14 @@ static PyObject *_wrap_SystemSettings_SetScreenType(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * SystemSettings_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SystemSettings_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSystemSettings, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SystemOptions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SystemOptions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSystemOptions *result;
     char *kwnames[] = {
@@ -1816,7 +1956,7 @@ static PyObject *_wrap_new_SystemOptions(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SystemOptions_SetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemOptions_SetOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -1869,7 +2009,7 @@ static PyObject *_wrap_SystemOptions_SetOption(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 ;
@@ -1886,7 +2026,7 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args
         if (arg1 == NULL) SWIG_fail;
         temp1 = True;
     }
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1910,7 +2050,7 @@ static PyObject *_wrap_SystemOptions_SetOptionInt(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SystemOptions_GetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemOptions_GetOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -1954,7 +2094,7 @@ static PyObject *_wrap_SystemOptions_GetOption(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int result;
@@ -1977,7 +2117,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp1)
         delete arg1;
@@ -1992,7 +2132,7 @@ static PyObject *_wrap_SystemOptions_GetOptionInt(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SystemOptions_HasOption(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool result;
@@ -2032,14 +2172,14 @@ static PyObject *_wrap_SystemOptions_HasOption(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * SystemOptions_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SystemOptions_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSystemOptions, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_FileSelectorPromptStr_set(PyObject *_val) {
+static int _wrap_FileSelectorPromptStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only.");
     return 1;
 }
@@ -2059,7 +2199,7 @@ static PyObject *_wrap_FileSelectorPromptStr_get() {
 }
 
 
-static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) {
+static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only.");
     return 1;
 }
@@ -2079,7 +2219,7 @@ static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() {
 }
 
 
-static int _wrap_DirSelectorPromptStr_set(PyObject *_val) {
+static int _wrap_DirSelectorPromptStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only.");
     return 1;
 }
@@ -2099,7 +2239,7 @@ static PyObject *_wrap_DirSelectorPromptStr_get() {
 }
 
 
-static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_NewId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -2114,14 +2254,14 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) {
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_RegisterId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -2130,7 +2270,7 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:RegisterId",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2146,7 +2286,7 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_GetCurrentId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetCurrentId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -2161,14 +2301,14 @@ static PyObject *_wrap_GetCurrentId(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IsStockID(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IsStockID(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     bool result;
@@ -2178,7 +2318,7 @@ static PyObject *_wrap_IsStockID(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IsStockID",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2196,7 +2336,7 @@ static PyObject *_wrap_IsStockID(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_IsStockLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IsStockLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxString *arg2 = 0 ;
@@ -2209,7 +2349,7 @@ static PyObject *_wrap_IsStockLabel(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:IsStockLabel",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
@@ -2240,7 +2380,7 @@ static PyObject *_wrap_IsStockLabel(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_GetStockLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetStockLabel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxString result;
@@ -2250,7 +2390,7 @@ static PyObject *_wrap_GetStockLabel(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetStockLabel",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2272,7 +2412,7 @@ static PyObject *_wrap_GetStockLabel(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Bell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Bell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -2294,7 +2434,7 @@ static PyObject *_wrap_Bell(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_EndBusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EndBusyCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -2316,7 +2456,7 @@ static PyObject *_wrap_EndBusyCursor(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetElapsedTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 = (bool) True ;
     long result;
@@ -2327,7 +2467,7 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:GetElapsedTime",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (bool) SWIG_AsBool(obj0); 
+        arg1 = (bool)SWIG_As_bool(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2337,25 +2477,27 @@ static PyObject *_wrap_GetElapsedTime(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetMousePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetMousePosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int *arg1 = (int *) 0 ;
     int *arg2 = (int *) 0 ;
     int temp1 ;
+    int res1 = 0 ;
     int temp2 ;
+    int res2 = 0 ;
     char *kwnames[] = {
         NULL 
     };
     
-    arg1 = &temp1;
-    arg2 = &temp2;
+    arg1 = &temp1; res1 = SWIG_NEWOBJ;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetMousePosition",kwnames)) goto fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -2366,21 +2508,17 @@ static PyObject *_wrap_GetMousePosition(PyObject *self, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg1));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res1 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg1)) : SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_IsBusy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IsBusy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -2404,7 +2542,7 @@ static PyObject *_wrap_IsBusy(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_Now(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Now(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2432,7 +2570,7 @@ static PyObject *_wrap_Now(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Shell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -2475,7 +2613,7 @@ static PyObject *_wrap_Shell(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_StartTimer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StartTimer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -2496,19 +2634,21 @@ static PyObject *_wrap_StartTimer(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_GetOsVersion(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetOsVersion(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int *arg1 = (int *) 0 ;
     int *arg2 = (int *) 0 ;
     int result;
     int temp1 ;
+    int res1 = 0 ;
     int temp2 ;
+    int res2 = 0 ;
     char *kwnames[] = {
         NULL 
     };
     
-    arg1 = &temp1;
-    arg2 = &temp2;
+    arg1 = &temp1; res1 = SWIG_NEWOBJ;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetOsVersion",kwnames)) goto fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2517,22 +2657,18 @@ static PyObject *_wrap_GetOsVersion(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg1));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = SWIG_From_int((int)result);
+    resultobj = t_output_helper(resultobj, ((res1 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg1)) : SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetOsDescription(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetOsDescription(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2560,7 +2696,7 @@ static PyObject *_wrap_GetOsDescription(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GetFreeMemory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetFreeMemory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -2575,14 +2711,14 @@ static PyObject *_wrap_GetFreeMemory(PyObject *self, PyObject *args, PyObject *k
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Shutdown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     bool result;
@@ -2592,7 +2728,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Shutdown",kwnames,&obj0)) goto fail;
-    arg1 = (wxShutdownFlags) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -2611,7 +2747,7 @@ static PyObject *_wrap_Shutdown(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_Sleep(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sleep(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -2620,7 +2756,7 @@ static PyObject *_wrap_Sleep(PyObject *self, PyObject *args, PyObject *kwargs) {
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Sleep",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2636,7 +2772,7 @@ static PyObject *_wrap_Sleep(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_MilliSleep(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MilliSleep(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long arg1 ;
     PyObject * obj0 = 0 ;
@@ -2645,7 +2781,7 @@ static PyObject *_wrap_MilliSleep(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MilliSleep",kwnames,&obj0)) goto fail;
-    arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2661,7 +2797,7 @@ static PyObject *_wrap_MilliSleep(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_MicroSleep(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MicroSleep(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long arg1 ;
     PyObject * obj0 = 0 ;
@@ -2670,7 +2806,7 @@ static PyObject *_wrap_MicroSleep(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MicroSleep",kwnames,&obj0)) goto fail;
-    arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2686,7 +2822,7 @@ static PyObject *_wrap_MicroSleep(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_EnableTopLevelWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_EnableTopLevelWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 ;
     PyObject * obj0 = 0 ;
@@ -2695,7 +2831,7 @@ static PyObject *_wrap_EnableTopLevelWindows(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:EnableTopLevelWindows",kwnames,&obj0)) goto fail;
-    arg1 = (bool) SWIG_AsBool(obj0); 
+    arg1 = (bool)SWIG_As_bool(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2711,7 +2847,7 @@ static PyObject *_wrap_EnableTopLevelWindows(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_StripMenuCodes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StripMenuCodes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -2755,7 +2891,7 @@ static PyObject *_wrap_StripMenuCodes(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_GetEmailAddress(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetEmailAddress(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2783,7 +2919,7 @@ static PyObject *_wrap_GetEmailAddress(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GetHostName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetHostName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2811,7 +2947,7 @@ static PyObject *_wrap_GetHostName(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_GetFullHostName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetFullHostName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2839,7 +2975,7 @@ static PyObject *_wrap_GetFullHostName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GetUserId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetUserId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2867,7 +3003,7 @@ static PyObject *_wrap_GetUserId(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_GetUserName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetUserName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2895,7 +3031,7 @@ static PyObject *_wrap_GetUserName(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_GetHomeDir(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetHomeDir(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -2923,7 +3059,7 @@ static PyObject *_wrap_GetHomeDir(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_GetUserHome(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetUserHome(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -2970,7 +3106,7 @@ static PyObject *_wrap_GetUserHome(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_GetProcessId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetProcessId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long result;
     char *kwnames[] = {
@@ -2985,14 +3121,14 @@ static PyObject *_wrap_GetProcessId(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Trap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Trap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -3013,7 +3149,7 @@ static PyObject *_wrap_Trap(PyObject *self, PyObject *args, PyObject *kwargs) {
 }
 
 
-static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileSelector(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyFileSelectorPromptStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -3085,7 +3221,7 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -3093,11 +3229,11 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (int) SWIG_AsInt(obj8); 
+        arg9 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3161,7 +3297,7 @@ static PyObject *_wrap_FileSelector(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LoadFileSelector(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -3247,7 +3383,7 @@ static PyObject *_wrap_LoadFileSelector(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SaveFileSelector(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -3333,7 +3469,7 @@ static PyObject *_wrap_SaveFileSelector(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirSelector(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyDirSelectorPromptStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -3372,7 +3508,7 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -3422,7 +3558,7 @@ static PyObject *_wrap_DirSelector(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetTextFromUser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -3473,15 +3609,15 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3529,7 +3665,7 @@ static PyObject *_wrap_GetTextFromUser(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetPasswordFromUser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -3618,7 +3754,7 @@ static PyObject *_wrap_GetPasswordFromUser(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetSingleChoice(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -3667,23 +3803,23 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj4) {
-        arg6 = (int) SWIG_AsInt(obj4); 
+        arg6 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg7 = (int) SWIG_AsInt(obj5); 
+        arg7 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg8 = (bool) SWIG_AsBool(obj6); 
+        arg8 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg9 = (int) SWIG_AsInt(obj7); 
+        arg9 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg10 = (int) SWIG_AsInt(obj8); 
+        arg10 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3729,7 +3865,7 @@ static PyObject *_wrap_GetSingleChoice(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetSingleChoiceIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -3778,23 +3914,23 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj4) {
-        arg6 = (int) SWIG_AsInt(obj4); 
+        arg6 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg7 = (int) SWIG_AsInt(obj5); 
+        arg7 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg8 = (bool) SWIG_AsBool(obj6); 
+        arg8 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg9 = (int) SWIG_AsInt(obj7); 
+        arg9 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg10 = (int) SWIG_AsInt(obj8); 
+        arg10 = (int)SWIG_As_int(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3805,7 +3941,7 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp1)
         delete arg1;
@@ -3834,7 +3970,7 @@ static PyObject *_wrap_GetSingleChoiceIndex(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MessageBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -3870,7 +4006,7 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -3878,11 +4014,11 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3893,7 +4029,7 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp1)
         delete arg1;
@@ -3916,7 +4052,7 @@ static PyObject *_wrap_MessageBox(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetNumberFromUser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -3960,14 +4096,14 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec
         if (arg3 == NULL) SWIG_fail;
         temp3 = True;
     }
-    arg4 = (long) SWIG_AsLong(obj3); 
+    arg4 = (long)SWIG_As_long(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -3988,7 +4124,7 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp1)
         delete arg1;
@@ -4019,7 +4155,7 @@ static PyObject *_wrap_GetNumberFromUser(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDisplay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -4044,7 +4180,7 @@ static PyObject *_wrap_ColourDisplay(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DisplayDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DisplayDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -4060,14 +4196,14 @@ static PyObject *_wrap_DisplayDepth(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetDisplayDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetDisplayDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -4083,25 +4219,27 @@ static PyObject *_wrap_GetDisplayDepth(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DisplaySize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DisplaySize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int *arg1 = (int *) 0 ;
     int *arg2 = (int *) 0 ;
     int temp1 ;
+    int res1 = 0 ;
     int temp2 ;
+    int res2 = 0 ;
     char *kwnames[] = {
         NULL 
     };
     
-    arg1 = &temp1;
-    arg2 = &temp2;
+    arg1 = &temp1; res1 = SWIG_NEWOBJ;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":DisplaySize",kwnames)) goto fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -4112,21 +4250,17 @@ static PyObject *_wrap_DisplaySize(PyObject *self, PyObject *args, PyObject *kwa
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg1));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res1 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg1)) : SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetDisplaySize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetDisplaySize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize result;
     char *kwnames[] = {
@@ -4153,18 +4287,20 @@ static PyObject *_wrap_GetDisplaySize(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DisplaySizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DisplaySizeMM(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int *arg1 = (int *) 0 ;
     int *arg2 = (int *) 0 ;
     int temp1 ;
+    int res1 = 0 ;
     int temp2 ;
+    int res2 = 0 ;
     char *kwnames[] = {
         NULL 
     };
     
-    arg1 = &temp1;
-    arg2 = &temp2;
+    arg1 = &temp1; res1 = SWIG_NEWOBJ;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":DisplaySizeMM",kwnames)) goto fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -4175,21 +4311,17 @@ static PyObject *_wrap_DisplaySizeMM(PyObject *self, PyObject *args, PyObject *k
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg1));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res1 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg1)) : SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetDisplaySizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetDisplaySizeMM(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSize result;
     char *kwnames[] = {
@@ -4216,24 +4348,28 @@ static PyObject *_wrap_GetDisplaySizeMM(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ClientDisplayRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ClientDisplayRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int *arg1 = (int *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int *arg4 = (int *) 0 ;
     int temp1 ;
+    int res1 = 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     char *kwnames[] = {
         NULL 
     };
     
-    arg1 = &temp1;
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
+    arg1 = &temp1; res1 = SWIG_NEWOBJ;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":ClientDisplayRect",kwnames)) goto fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -4244,29 +4380,21 @@ static PyObject *_wrap_ClientDisplayRect(PyObject *self, PyObject *args, PyObjec
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg1));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg3));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res1 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg1)) : SWIG_NewPointerObj((void*)(arg1), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetClientDisplayRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetClientDisplayRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxRect result;
     char *kwnames[] = {
@@ -4293,7 +4421,7 @@ static PyObject *_wrap_GetClientDisplayRect(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCursor *arg1 = 0 ;
     PyObject * obj0 = 0 ;
@@ -4324,7 +4452,7 @@ static PyObject *_wrap_SetCursor(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_BeginBusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BeginBusyCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCursor *arg1 = (wxCursor *) wxHOURGLASS_CURSOR ;
     PyObject * obj0 = 0 ;
@@ -4352,7 +4480,7 @@ static PyObject *_wrap_BeginBusyCursor(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GetActiveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetActiveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *result;
     char *kwnames[] = {
@@ -4377,7 +4505,7 @@ static PyObject *_wrap_GetActiveWindow(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GenericFindWindowAtPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GenericFindWindowAtPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = 0 ;
     wxWindow *result;
@@ -4409,7 +4537,7 @@ static PyObject *_wrap_GenericFindWindowAtPoint(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindWindowAtPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindWindowAtPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = 0 ;
     wxWindow *result;
@@ -4441,7 +4569,7 @@ static PyObject *_wrap_FindWindowAtPoint(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GetTopLevelParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetTopLevelParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxWindow *result;
@@ -4470,7 +4598,7 @@ static PyObject *_wrap_GetTopLevelParent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetKeyState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     bool result;
@@ -4480,7 +4608,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GetKeyState",kwnames,&obj0)) goto fail;
-    arg1 = (wxKeyCode) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -4499,7 +4627,7 @@ static PyObject *_wrap_GetKeyState(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_WakeUpMainThread(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WakeUpMainThread(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -4521,7 +4649,7 @@ static PyObject *_wrap_WakeUpMainThread(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MutexGuiEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MutexGuiEnter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -4543,7 +4671,7 @@ static PyObject *_wrap_MutexGuiEnter(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_MutexGuiLeave(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MutexGuiLeave(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -4565,7 +4693,7 @@ static PyObject *_wrap_MutexGuiLeave(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_MutexGuiLocker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MutexGuiLocker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMutexGuiLocker *result;
     char *kwnames[] = {
@@ -4588,7 +4716,7 @@ static PyObject *_wrap_new_MutexGuiLocker(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_MutexGuiLocker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_MutexGuiLocker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMutexGuiLocker *arg1 = (wxMutexGuiLocker *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4613,14 +4741,14 @@ static PyObject *_wrap_delete_MutexGuiLocker(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * MutexGuiLocker_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MutexGuiLocker_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMutexGuiLocker, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Thread_IsMain(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Thread_IsMain(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -4644,7 +4772,7 @@ static PyObject *_wrap_Thread_IsMain(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ToolTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxToolTip *result;
@@ -4685,7 +4813,7 @@ static PyObject *_wrap_new_ToolTip(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_ToolTip_SetTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolTip_SetTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolTip *arg1 = (wxToolTip *) 0 ;
     wxString *arg2 = 0 ;
@@ -4726,7 +4854,7 @@ static PyObject *_wrap_ToolTip_SetTip(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ToolTip_GetTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolTip_GetTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolTip *arg1 = (wxToolTip *) 0 ;
     wxString result;
@@ -4758,7 +4886,7 @@ static PyObject *_wrap_ToolTip_GetTip(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ToolTip_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolTip_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxToolTip *arg1 = (wxToolTip *) 0 ;
     wxWindow *result;
@@ -4786,7 +4914,7 @@ static PyObject *_wrap_ToolTip_GetWindow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolTip_Enable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 ;
     PyObject * obj0 = 0 ;
@@ -4795,7 +4923,7 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_Enable",kwnames,&obj0)) goto fail;
-    arg1 = (bool) SWIG_AsBool(obj0); 
+    arg1 = (bool)SWIG_As_bool(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4811,7 +4939,7 @@ static PyObject *_wrap_ToolTip_Enable(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ToolTip_SetDelay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ToolTip_SetDelay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     PyObject * obj0 = 0 ;
@@ -4820,7 +4948,7 @@ static PyObject *_wrap_ToolTip_SetDelay(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ToolTip_SetDelay",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4836,14 +4964,14 @@ static PyObject *_wrap_ToolTip_SetDelay(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * ToolTip_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ToolTip_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxToolTip, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Caret(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Caret(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -4877,7 +5005,7 @@ static PyObject *_wrap_new_Caret(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_Caret(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Caret(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     PyObject * obj0 = 0 ;
@@ -4902,7 +5030,7 @@ static PyObject *_wrap_delete_Caret(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Caret_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     bool result;
@@ -4930,7 +5058,7 @@ static PyObject *_wrap_Caret_IsOk(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     bool result;
@@ -4958,7 +5086,7 @@ static PyObject *_wrap_Caret_IsVisible(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Caret_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     wxPoint result;
@@ -4988,20 +5116,22 @@ static PyObject *_wrap_Caret_GetPosition(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Caret_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_GetPositionTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_GetPositionTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCaret,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -5013,21 +5143,17 @@ static PyObject *_wrap_Caret_GetPositionTuple(PyObject *self, PyObject *args, Py
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Caret_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     wxSize result;
@@ -5057,20 +5183,22 @@ static PyObject *_wrap_Caret_GetSize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Caret_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_GetSizeTuple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_GetSizeTuple",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCaret,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -5082,21 +5210,17 @@ static PyObject *_wrap_Caret_GetSizeTuple(PyObject *self, PyObject *args, PyObje
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Caret_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     wxWindow *result;
@@ -5124,7 +5248,7 @@ static PyObject *_wrap_Caret_GetWindow(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Caret_MoveXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_MoveXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     int arg2 ;
@@ -5139,9 +5263,9 @@ static PyObject *_wrap_Caret_MoveXY(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Caret_MoveXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCaret,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5157,7 +5281,7 @@ static PyObject *_wrap_Caret_MoveXY(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Caret_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_Move(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -5189,7 +5313,7 @@ static PyObject *_wrap_Caret_Move(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Caret_SetSizeWH(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_SetSizeWH(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     int arg2 ;
@@ -5204,9 +5328,9 @@ static PyObject *_wrap_Caret_SetSizeWH(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Caret_SetSizeWH",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCaret,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5222,7 +5346,7 @@ static PyObject *_wrap_Caret_SetSizeWH(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Caret_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     wxSize *arg2 = 0 ;
@@ -5254,7 +5378,7 @@ static PyObject *_wrap_Caret_SetSize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     int arg2 = (int) True ;
@@ -5268,7 +5392,7 @@ static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCaret,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5285,7 +5409,7 @@ static PyObject *_wrap_Caret_Show(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Caret_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_Hide(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCaret *arg1 = (wxCaret *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5310,14 +5434,14 @@ static PyObject *_wrap_Caret_Hide(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject * Caret_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Caret_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCaret, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Caret_GetBlinkTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_GetBlinkTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -5332,14 +5456,14 @@ static PyObject *_wrap_Caret_GetBlinkTime(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Caret_SetBlinkTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Caret_SetBlinkTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -5348,7 +5472,7 @@ static PyObject *_wrap_Caret_SetBlinkTime(PyObject *self, PyObject *args, PyObje
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Caret_SetBlinkTime",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5364,7 +5488,7 @@ static PyObject *_wrap_Caret_SetBlinkTime(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_BusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BusyCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCursor *arg1 = (wxCursor *) wxHOURGLASS_CURSOR ;
     wxBusyCursor *result;
@@ -5393,7 +5517,7 @@ static PyObject *_wrap_new_BusyCursor(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_BusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_BusyCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBusyCursor *arg1 = (wxBusyCursor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5418,14 +5542,14 @@ static PyObject *_wrap_delete_BusyCursor(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * BusyCursor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BusyCursor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBusyCursor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_WindowDisabler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WindowDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) NULL ;
     wxWindowDisabler *result;
@@ -5454,7 +5578,7 @@ static PyObject *_wrap_new_WindowDisabler(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_WindowDisabler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_WindowDisabler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindowDisabler *arg1 = (wxWindowDisabler *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5479,14 +5603,14 @@ static PyObject *_wrap_delete_WindowDisabler(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * WindowDisabler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WindowDisabler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWindowDisabler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BusyInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxBusyInfo *result;
@@ -5525,7 +5649,7 @@ static PyObject *_wrap_new_BusyInfo(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_BusyInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_BusyInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBusyInfo *arg1 = (wxBusyInfo *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5550,14 +5674,14 @@ static PyObject *_wrap_delete_BusyInfo(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * BusyInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BusyInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBusyInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StopWatch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StopWatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStopWatch *result;
     char *kwnames[] = {
@@ -5579,7 +5703,7 @@ static PyObject *_wrap_new_StopWatch(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_StopWatch_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StopWatch_Start(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStopWatch *arg1 = (wxStopWatch *) 0 ;
     long arg2 = (long) 0 ;
@@ -5593,7 +5717,7 @@ static PyObject *_wrap_StopWatch_Start(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStopWatch,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5610,7 +5734,7 @@ static PyObject *_wrap_StopWatch_Start(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StopWatch_Pause(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StopWatch_Pause(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStopWatch *arg1 = (wxStopWatch *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5635,7 +5759,7 @@ static PyObject *_wrap_StopWatch_Pause(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StopWatch_Resume(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StopWatch_Resume(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStopWatch *arg1 = (wxStopWatch *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5660,7 +5784,7 @@ static PyObject *_wrap_StopWatch_Resume(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StopWatch_Time(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StopWatch_Time(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStopWatch *arg1 = (wxStopWatch *) 0 ;
     long result;
@@ -5679,21 +5803,21 @@ static PyObject *_wrap_StopWatch_Time(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * StopWatch_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StopWatch_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStopWatch, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileHistory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 9 ;
     int arg2 = (int) wxID_FILE1 ;
@@ -5706,11 +5830,11 @@ static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FileHistory",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5727,7 +5851,7 @@ static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_FileHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FileHistory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5752,7 +5876,7 @@ static PyObject *_wrap_delete_FileHistory(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxString *arg2 = 0 ;
@@ -5793,7 +5917,7 @@ static PyObject *_wrap_FileHistory_AddFileToHistory(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_FileHistory_RemoveFileFromHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_RemoveFileFromHistory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     int arg2 ;
@@ -5806,7 +5930,7 @@ static PyObject *_wrap_FileHistory_RemoveFileFromHistory(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileHistory_RemoveFileFromHistory",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileHistory,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5822,7 +5946,7 @@ static PyObject *_wrap_FileHistory_RemoveFileFromHistory(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_FileHistory_GetMaxFiles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_GetMaxFiles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     int result;
@@ -5841,14 +5965,14 @@ static PyObject *_wrap_FileHistory_GetMaxFiles(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FileHistory_UseMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_UseMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -5877,7 +6001,7 @@ static PyObject *_wrap_FileHistory_UseMenu(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FileHistory_RemoveMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_RemoveMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -5906,7 +6030,7 @@ static PyObject *_wrap_FileHistory_RemoveMenu(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FileHistory_Load(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_Load(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxConfigBase *arg2 = 0 ;
@@ -5940,7 +6064,7 @@ static PyObject *_wrap_FileHistory_Load(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FileHistory_Save(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_Save(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxConfigBase *arg2 = 0 ;
@@ -5974,7 +6098,7 @@ static PyObject *_wrap_FileHistory_Save(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FileHistory_AddFilesToMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_AddFilesToMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     PyObject * obj0 = 0 ;
@@ -5999,7 +6123,7 @@ static PyObject *_wrap_FileHistory_AddFilesToMenu(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileHistory_AddFilesToThisMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_AddFilesToThisMenu(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     wxMenu *arg2 = (wxMenu *) 0 ;
@@ -6028,7 +6152,7 @@ static PyObject *_wrap_FileHistory_AddFilesToThisMenu(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_FileHistory_GetHistoryFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_GetHistoryFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     int arg2 ;
@@ -6042,7 +6166,7 @@ static PyObject *_wrap_FileHistory_GetHistoryFile(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileHistory_GetHistoryFile",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileHistory,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6064,7 +6188,7 @@ static PyObject *_wrap_FileHistory_GetHistoryFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileHistory_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileHistory_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileHistory *arg1 = (wxFileHistory *) 0 ;
     int result;
@@ -6083,21 +6207,21 @@ static PyObject *_wrap_FileHistory_GetCount(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * FileHistory_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileHistory_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileHistory, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SingleInstanceChecker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SingleInstanceChecker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -6154,7 +6278,7 @@ static PyObject *_wrap_new_SingleInstanceChecker(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_PreSingleInstanceChecker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSingleInstanceChecker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleInstanceChecker *result;
     char *kwnames[] = {
@@ -6176,7 +6300,7 @@ static PyObject *_wrap_new_PreSingleInstanceChecker(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_delete_SingleInstanceChecker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_SingleInstanceChecker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleInstanceChecker *arg1 = (wxSingleInstanceChecker *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6201,7 +6325,7 @@ static PyObject *_wrap_delete_SingleInstanceChecker(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleInstanceChecker *arg1 = (wxSingleInstanceChecker *) 0 ;
     wxString *arg2 = 0 ;
@@ -6264,7 +6388,7 @@ static PyObject *_wrap_SingleInstanceChecker_Create(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleInstanceChecker *arg1 = (wxSingleInstanceChecker *) 0 ;
     bool result;
@@ -6292,14 +6416,14 @@ static PyObject *_wrap_SingleInstanceChecker_IsAnotherRunning(PyObject *self, Py
 }
 
 
-static PyObject * SingleInstanceChecker_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SingleInstanceChecker_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSingleInstanceChecker, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_DrawWindowOnDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DrawWindowOnDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxDC *arg2 = 0 ;
@@ -6321,7 +6445,7 @@ static PyObject *_wrap_DrawWindowOnDC(PyObject *self, PyObject *args, PyObject *
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6337,7 +6461,7 @@ static PyObject *_wrap_DrawWindowOnDC(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_TipProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_TipProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTipProvider *arg1 = (wxTipProvider *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6362,7 +6486,7 @@ static PyObject *_wrap_delete_TipProvider(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TipProvider_GetTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TipProvider_GetTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTipProvider *arg1 = (wxTipProvider *) 0 ;
     wxString result;
@@ -6394,7 +6518,7 @@ static PyObject *_wrap_TipProvider_GetTip(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TipProvider_GetCurrentTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TipProvider_GetCurrentTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTipProvider *arg1 = (wxTipProvider *) 0 ;
     size_t result;
@@ -6413,14 +6537,14 @@ static PyObject *_wrap_TipProvider_GetCurrentTip(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTipProvider *arg1 = (wxTipProvider *) 0 ;
     wxString *arg2 = 0 ;
@@ -6468,14 +6592,14 @@ static PyObject *_wrap_TipProvider_PreprocessTip(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * TipProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TipProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTipProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyTipProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyTipProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     size_t arg1 ;
     wxPyTipProvider *result;
@@ -6485,7 +6609,7 @@ static PyObject *_wrap_new_PyTipProvider(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_PyTipProvider",kwnames,&obj0)) goto fail;
-    arg1 = (size_t) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (size_t)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6501,7 +6625,7 @@ static PyObject *_wrap_new_PyTipProvider(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_PyTipProvider__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTipProvider__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTipProvider *arg1 = (wxPyTipProvider *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -6532,14 +6656,14 @@ static PyObject *_wrap_PyTipProvider__setCallbackInfo(PyObject *self, PyObject *
 }
 
 
-static PyObject * PyTipProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyTipProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTipProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ShowTip(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxTipProvider *arg2 = (wxTipProvider *) 0 ;
@@ -6558,7 +6682,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs)
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxTipProvider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6578,7 +6702,7 @@ static PyObject *_wrap_ShowTip(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CreateFileTipProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     size_t arg2 ;
@@ -6596,7 +6720,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO
         if (arg1 == NULL) SWIG_fail;
         temp1 = True;
     }
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         if (!wxPyCheckForApp()) SWIG_fail;
@@ -6621,7 +6745,7 @@ static PyObject *_wrap_CreateFileTipProvider(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_Timer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Timer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) NULL ;
     int arg2 = (int) -1 ;
@@ -6638,7 +6762,7 @@ static PyObject *_wrap_new_Timer(PyObject *self, PyObject *args, PyObject *kwarg
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6656,7 +6780,7 @@ static PyObject *_wrap_new_Timer(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_delete_Timer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Timer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6681,7 +6805,7 @@ static PyObject *_wrap_delete_Timer(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Timer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -6701,7 +6825,7 @@ static PyObject *_wrap_Timer__setCallbackInfo(PyObject *self, PyObject *args, Py
     arg2 = obj1;
     arg3 = obj2;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6718,7 +6842,7 @@ static PyObject *_wrap_Timer__setCallbackInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_SetOwner(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     wxEvtHandler *arg2 = (wxEvtHandler *) 0 ;
@@ -6736,7 +6860,7 @@ static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6753,7 +6877,7 @@ static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Timer_GetOwner(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_GetOwner(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     wxEvtHandler *result;
@@ -6781,7 +6905,7 @@ static PyObject *_wrap_Timer_GetOwner(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_Start(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     int arg2 = (int) -1 ;
@@ -6798,11 +6922,11 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTimer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6821,7 +6945,7 @@ static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Timer_Stop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_Stop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6846,7 +6970,7 @@ static PyObject *_wrap_Timer_Stop(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_IsRunning(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     bool result;
@@ -6874,7 +6998,7 @@ static PyObject *_wrap_Timer_IsRunning(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_GetInterval(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     int result;
@@ -6893,14 +7017,14 @@ static PyObject *_wrap_Timer_GetInterval(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_IsOneShot(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     bool result;
@@ -6928,7 +7052,7 @@ static PyObject *_wrap_Timer_IsOneShot(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Timer_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Timer_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTimer *arg1 = (wxPyTimer *) 0 ;
     int result;
@@ -6947,21 +7071,21 @@ static PyObject *_wrap_Timer_GetId(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * Timer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Timer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTimer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TimerEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TimerEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -6974,11 +7098,11 @@ static PyObject *_wrap_new_TimerEvent(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_TimerEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6995,7 +7119,7 @@ static PyObject *_wrap_new_TimerEvent(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_TimerEvent_GetInterval(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimerEvent_GetInterval(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimerEvent *arg1 = (wxTimerEvent *) 0 ;
     int result;
@@ -7014,21 +7138,21 @@ static PyObject *_wrap_TimerEvent_GetInterval(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * TimerEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TimerEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTimerEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TimerRunner__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_TimerRunner__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxTimer *arg1 = 0 ;
     wxTimerRunner *result;
@@ -7057,7 +7181,7 @@ static PyObject *_wrap_new_TimerRunner__SWIG_0(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxTimer *arg1 = 0 ;
     int arg2 ;
@@ -7075,10 +7199,10 @@ static PyObject *_wrap_new_TimerRunner__SWIG_1(PyObject *self, PyObject *args) {
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7132,12 +7256,12 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
-            _v = SWIG_CheckInt(argv[1]);
+            _v = SWIG_Check_int(argv[1]);
             if (_v) {
                 if (argc <= 2) {
                     return _wrap_new_TimerRunner__SWIG_1(self,args);
                 }
-                _v = SWIG_CheckBool(argv[2]);
+                _v = SWIG_Check_bool(argv[2]);
                 if (_v) {
                     return _wrap_new_TimerRunner__SWIG_1(self,args);
                 }
@@ -7150,7 +7274,7 @@ static PyObject *_wrap_new_TimerRunner(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_delete_TimerRunner(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_TimerRunner(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimerRunner *arg1 = (wxTimerRunner *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7175,7 +7299,7 @@ static PyObject *_wrap_delete_TimerRunner(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimerRunner_Start(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimerRunner *arg1 = (wxTimerRunner *) 0 ;
     int arg2 ;
@@ -7190,10 +7314,10 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TimerRunner_Start",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimerRunner,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7210,14 +7334,14 @@ static PyObject *_wrap_TimerRunner_Start(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * TimerRunner_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TimerRunner_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTimerRunner, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Log(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Log(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLog *result;
     char *kwnames[] = {
@@ -7239,7 +7363,7 @@ static PyObject *_wrap_new_Log(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_IsEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -7263,7 +7387,7 @@ static PyObject *_wrap_Log_IsEnabled(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_EnableLogging(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 = (bool) True ;
     bool result;
@@ -7274,7 +7398,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_EnableLogging",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (bool) SWIG_AsBool(obj0); 
+        arg1 = (bool)SWIG_As_bool(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7293,7 +7417,7 @@ static PyObject *_wrap_Log_EnableLogging(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Log_OnLog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_OnLog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogLevel arg1 ;
     wxChar *arg2 = (wxChar *) 0 ;
@@ -7306,11 +7430,11 @@ static PyObject *_wrap_Log_OnLog(PyObject *self, PyObject *args, PyObject *kwarg
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Log_OnLog",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (wxLogLevel) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (wxLogLevel)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxChar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (time_t) SWIG_AsUnsignedInt(obj2); 
+    arg3 = (time_t)SWIG_As_unsigned_SS_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7326,7 +7450,7 @@ static PyObject *_wrap_Log_OnLog(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Log_Flush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_Flush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLog *arg1 = (wxLog *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7351,7 +7475,7 @@ static PyObject *_wrap_Log_Flush(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_Log_FlushActive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_FlushActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7372,7 +7496,7 @@ static PyObject *_wrap_Log_FlushActive(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Log_GetActiveTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_GetActiveTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLog *result;
     char *kwnames[] = {
@@ -7394,7 +7518,7 @@ static PyObject *_wrap_Log_GetActiveTarget(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Log_SetActiveTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_SetActiveTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLog *arg1 = (wxLog *) 0 ;
     wxLog *result;
@@ -7420,7 +7544,7 @@ static PyObject *_wrap_Log_SetActiveTarget(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Log_Suspend(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_Suspend(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7441,7 +7565,7 @@ static PyObject *_wrap_Log_Suspend(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Log_Resume(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_Resume(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7462,7 +7586,7 @@ static PyObject *_wrap_Log_Resume(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_SetVerbose(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 = (bool) True ;
     PyObject * obj0 = 0 ;
@@ -7472,7 +7596,7 @@ static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Log_SetVerbose",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (bool) SWIG_AsBool(obj0); 
+        arg1 = (bool)SWIG_As_bool(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7489,7 +7613,7 @@ static PyObject *_wrap_Log_SetVerbose(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Log_SetLogLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_SetLogLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogLevel arg1 ;
     PyObject * obj0 = 0 ;
@@ -7498,7 +7622,7 @@ static PyObject *_wrap_Log_SetLogLevel(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetLogLevel",kwnames,&obj0)) goto fail;
-    arg1 = (wxLogLevel) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (wxLogLevel)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7514,7 +7638,7 @@ static PyObject *_wrap_Log_SetLogLevel(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Log_DontCreateOnDemand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_DontCreateOnDemand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7535,7 +7659,7 @@ static PyObject *_wrap_Log_DontCreateOnDemand(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_SetTraceMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTraceMask arg1 ;
     PyObject * obj0 = 0 ;
@@ -7544,7 +7668,7 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Log_SetTraceMask",kwnames,&obj0)) goto fail;
-    arg1 = (wxTraceMask) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (wxTraceMask)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7560,7 +7684,7 @@ static PyObject *_wrap_Log_SetTraceMask(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_AddTraceMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -7597,7 +7721,7 @@ static PyObject *_wrap_Log_AddTraceMask(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Log_RemoveTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_RemoveTraceMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -7634,7 +7758,7 @@ static PyObject *_wrap_Log_RemoveTraceMask(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Log_ClearTraceMasks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_ClearTraceMasks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -7655,7 +7779,7 @@ static PyObject *_wrap_Log_ClearTraceMasks(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Log_GetTraceMasks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_GetTraceMasks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrayString *result;
     char *kwnames[] = {
@@ -7682,7 +7806,7 @@ static PyObject *_wrap_Log_GetTraceMasks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Log_SetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_SetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChar *arg1 = (wxChar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7707,7 +7831,7 @@ static PyObject *_wrap_Log_SetTimestamp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Log_GetVerbose(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_GetVerbose(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -7731,7 +7855,7 @@ static PyObject *_wrap_Log_GetVerbose(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Log_GetTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_GetTraceMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTraceMask result;
     char *kwnames[] = {
@@ -7746,14 +7870,14 @@ static PyObject *_wrap_Log_GetTraceMask(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChar *arg1 = (wxChar *) 0 ;
     bool result;
@@ -7781,7 +7905,7 @@ static PyObject *_wrap_Log_IsAllowedTraceMask(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Log_GetLogLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_GetLogLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogLevel result;
     char *kwnames[] = {
@@ -7796,14 +7920,14 @@ static PyObject *_wrap_Log_GetLogLevel(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Log_GetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_GetTimestamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxChar *result;
     char *kwnames[] = {
@@ -7825,7 +7949,7 @@ static PyObject *_wrap_Log_GetTimestamp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Log_TimeStamp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_TimeStamp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString result;
     char *kwnames[] = {
@@ -7853,7 +7977,7 @@ static PyObject *_wrap_Log_TimeStamp(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Log_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Log_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLog *arg1 = (wxLog *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7878,14 +8002,14 @@ static PyObject *_wrap_Log_Destroy(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject * Log_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Log_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LogStderr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LogStderr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogStderr *result;
     char *kwnames[] = {
@@ -7907,14 +8031,14 @@ static PyObject *_wrap_new_LogStderr(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject * LogStderr_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LogStderr_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLogStderr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LogTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LogTextCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextCtrl *arg1 = (wxTextCtrl *) 0 ;
     wxLogTextCtrl *result;
@@ -7940,14 +8064,14 @@ static PyObject *_wrap_new_LogTextCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * LogTextCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LogTextCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLogTextCtrl, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LogGui(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LogGui(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogGui *result;
     char *kwnames[] = {
@@ -7969,14 +8093,14 @@ static PyObject *_wrap_new_LogGui(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject * LogGui_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LogGui_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLogGui, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LogWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -8001,11 +8125,11 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8030,7 +8154,7 @@ static PyObject *_wrap_new_LogWindow(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogWindow_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogWindow *arg1 = (wxLogWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -8044,7 +8168,7 @@ static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLogWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8061,7 +8185,7 @@ static PyObject *_wrap_LogWindow_Show(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_LogWindow_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogWindow_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogWindow *arg1 = (wxLogWindow *) 0 ;
     wxFrame *result;
@@ -8089,7 +8213,7 @@ static PyObject *_wrap_LogWindow_GetFrame(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_LogWindow_GetOldLog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogWindow_GetOldLog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogWindow *arg1 = (wxLogWindow *) 0 ;
     wxLog *result;
@@ -8115,7 +8239,7 @@ static PyObject *_wrap_LogWindow_GetOldLog(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogWindow *arg1 = (wxLogWindow *) 0 ;
     bool result;
@@ -8143,7 +8267,7 @@ static PyObject *_wrap_LogWindow_IsPassingMessages(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_LogWindow_PassMessages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogWindow_PassMessages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogWindow *arg1 = (wxLogWindow *) 0 ;
     bool arg2 ;
@@ -8156,7 +8280,7 @@ static PyObject *_wrap_LogWindow_PassMessages(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogWindow_PassMessages",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLogWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8172,14 +8296,14 @@ static PyObject *_wrap_LogWindow_PassMessages(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * LogWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LogWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLogWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LogChain(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LogChain(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLog *arg1 = (wxLog *) 0 ;
     wxLogChain *result;
@@ -8205,7 +8329,7 @@ static PyObject *_wrap_new_LogChain(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_LogChain_SetLog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogChain_SetLog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogChain *arg1 = (wxLogChain *) 0 ;
     wxLog *arg2 = (wxLog *) 0 ;
@@ -8234,7 +8358,7 @@ static PyObject *_wrap_LogChain_SetLog(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_LogChain_PassMessages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogChain_PassMessages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogChain *arg1 = (wxLogChain *) 0 ;
     bool arg2 ;
@@ -8247,7 +8371,7 @@ static PyObject *_wrap_LogChain_PassMessages(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogChain_PassMessages",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxLogChain,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8263,7 +8387,7 @@ static PyObject *_wrap_LogChain_PassMessages(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogChain *arg1 = (wxLogChain *) 0 ;
     bool result;
@@ -8291,7 +8415,7 @@ static PyObject *_wrap_LogChain_IsPassingMessages(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_LogChain_GetOldLog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogChain_GetOldLog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogChain *arg1 = (wxLogChain *) 0 ;
     wxLog *result;
@@ -8317,14 +8441,14 @@ static PyObject *_wrap_LogChain_GetOldLog(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * LogChain_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LogChain_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLogChain, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_SysErrorCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SysErrorCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long result;
     char *kwnames[] = {
@@ -8339,14 +8463,14 @@ static PyObject *_wrap_SysErrorCode(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SysErrorMsg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long arg1 = (unsigned long) 0 ;
     wxString result;
@@ -8357,7 +8481,7 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SysErrorMsg",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 
+        arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8380,7 +8504,7 @@ static PyObject *_wrap_SysErrorMsg(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogFatalError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8417,7 +8541,7 @@ static PyObject *_wrap_LogFatalError(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8454,7 +8578,7 @@ static PyObject *_wrap_LogError(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogWarning(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8491,7 +8615,7 @@ static PyObject *_wrap_LogWarning(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8528,7 +8652,7 @@ static PyObject *_wrap_LogMessage(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8565,7 +8689,7 @@ static PyObject *_wrap_LogInfo(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogDebug(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8602,7 +8726,7 @@ static PyObject *_wrap_LogDebug(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogVerbose(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8639,7 +8763,7 @@ static PyObject *_wrap_LogVerbose(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_LogStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8676,7 +8800,7 @@ static PyObject *_wrap_LogStatus(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogStatusFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -8717,7 +8841,7 @@ static PyObject *_wrap_LogStatusFrame(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogSysError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     bool temp1 = False ;
@@ -8754,7 +8878,7 @@ static PyObject *_wrap_LogSysError(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_LogTrace__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_LogTrace__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     unsigned long arg1 ;
     wxString *arg2 = 0 ;
@@ -8763,7 +8887,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *self, PyObject *args) {
     PyObject * obj1 = 0 ;
     
     if(!PyArg_ParseTuple(args,(char *)"OO:LogTrace",&obj0,&obj1)) goto fail;
-    arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
@@ -8792,7 +8916,7 @@ static PyObject *_wrap_LogTrace__SWIG_0(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_LogTrace__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_LogTrace__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -8867,7 +8991,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) {
     }
     if (argc == 2) {
         int _v;
-        _v = SWIG_CheckUnsignedLong(argv[0]);
+        _v = SWIG_Check_unsigned_SS_long(argv[0]);
         if (_v) {
             {
                 _v = PyString_Check(argv[1]) || PyUnicode_Check(argv[1]);
@@ -8883,7 +9007,7 @@ static PyObject *_wrap_LogTrace(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LogGeneric(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     unsigned long arg1 ;
     wxString *arg2 = 0 ;
@@ -8895,7 +9019,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:LogGeneric",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0); 
+    arg1 = (unsigned long)SWIG_As_unsigned_SS_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg2 = wxString_in_helper(obj1);
@@ -8924,7 +9048,7 @@ static PyObject *_wrap_LogGeneric(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_SafeShowMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SafeShowMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -8977,7 +9101,7 @@ static PyObject *_wrap_SafeShowMessage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_LogNull(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LogNull(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogNull *result;
     char *kwnames[] = {
@@ -8999,7 +9123,7 @@ static PyObject *_wrap_new_LogNull(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_LogNull(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_LogNull(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLogNull *arg1 = (wxLogNull *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9024,14 +9148,14 @@ static PyObject *_wrap_delete_LogNull(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject * LogNull_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LogNull_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLogNull, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyLog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyLog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLog *result;
     char *kwnames[] = {
@@ -9053,7 +9177,7 @@ static PyObject *_wrap_new_PyLog(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_PyLog__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyLog__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyLog *arg1 = (wxPyLog *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -9084,14 +9208,14 @@ static PyObject *_wrap_PyLog__setCallbackInfo(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * PyLog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyLog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyLog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_Kill(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxSIGTERM ;
@@ -9103,10 +9227,10 @@ static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kw
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Kill",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (wxSignal) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9116,14 +9240,14 @@ static PyObject *_wrap_Process_Kill(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_Exists(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     bool result;
@@ -9133,7 +9257,7 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Process_Exists",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9151,7 +9275,7 @@ static PyObject *_wrap_Process_Exists(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_Open(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 = (int) wxEXEC_ASYNC ;
@@ -9170,7 +9294,7 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9195,7 +9319,7 @@ static PyObject *_wrap_Process_Open(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_Process(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Process(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEvtHandler *arg1 = (wxEvtHandler *) NULL ;
     int arg2 = (int) -1 ;
@@ -9212,7 +9336,7 @@ static PyObject *_wrap_new_Process(PyObject *self, PyObject *args, PyObject *kwa
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9229,7 +9353,7 @@ static PyObject *_wrap_new_Process(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Process__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -9260,7 +9384,7 @@ static PyObject *_wrap_Process__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Process_base_OnTerminate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_base_OnTerminate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     int arg2 ;
@@ -9275,9 +9399,9 @@ static PyObject *_wrap_Process_base_OnTerminate(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Process_base_OnTerminate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyProcess,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9293,7 +9417,7 @@ static PyObject *_wrap_Process_base_OnTerminate(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Process_Redirect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_Redirect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9318,7 +9442,7 @@ static PyObject *_wrap_Process_Redirect(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Process_IsRedirected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_IsRedirected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     bool result;
@@ -9346,7 +9470,7 @@ static PyObject *_wrap_Process_IsRedirected(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Process_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_Detach(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9371,7 +9495,7 @@ static PyObject *_wrap_Process_Detach(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Process_GetInputStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_GetInputStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     wxInputStream *result;
@@ -9404,7 +9528,7 @@ static PyObject *_wrap_Process_GetInputStream(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Process_GetErrorStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_GetErrorStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     wxInputStream *result;
@@ -9437,7 +9561,7 @@ static PyObject *_wrap_Process_GetErrorStream(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Process_GetOutputStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_GetOutputStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     wxOutputStream *result;
@@ -9463,7 +9587,7 @@ static PyObject *_wrap_Process_GetOutputStream(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Process_CloseOutput(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_CloseOutput(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9488,7 +9612,7 @@ static PyObject *_wrap_Process_CloseOutput(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Process_IsInputOpened(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_IsInputOpened(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     bool result;
@@ -9516,7 +9640,7 @@ static PyObject *_wrap_Process_IsInputOpened(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Process_IsInputAvailable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_IsInputAvailable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     bool result;
@@ -9544,7 +9668,7 @@ static PyObject *_wrap_Process_IsInputAvailable(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Process_IsErrorAvailable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Process_IsErrorAvailable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyProcess *arg1 = (wxPyProcess *) 0 ;
     bool result;
@@ -9572,14 +9696,14 @@ static PyObject *_wrap_Process_IsErrorAvailable(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * Process_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Process_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyProcess, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ProcessEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ProcessEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -9594,15 +9718,15 @@ static PyObject *_wrap_new_ProcessEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOO:new_ProcessEvent",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9619,7 +9743,7 @@ static PyObject *_wrap_new_ProcessEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ProcessEvent_GetPid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProcessEvent_GetPid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProcessEvent *arg1 = (wxProcessEvent *) 0 ;
     int result;
@@ -9638,14 +9762,14 @@ static PyObject *_wrap_ProcessEvent_GetPid(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ProcessEvent_GetExitCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProcessEvent_GetExitCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProcessEvent *arg1 = (wxProcessEvent *) 0 ;
     int result;
@@ -9664,14 +9788,14 @@ static PyObject *_wrap_ProcessEvent_GetExitCode(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ProcessEvent_m_pid_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProcessEvent_m_pid_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProcessEvent *arg1 = (wxProcessEvent *) 0 ;
     int arg2 ;
@@ -9684,7 +9808,7 @@ static PyObject *_wrap_ProcessEvent_m_pid_set(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ProcessEvent_m_pid_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxProcessEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_pid = arg2;
     
@@ -9695,7 +9819,7 @@ static PyObject *_wrap_ProcessEvent_m_pid_set(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ProcessEvent_m_pid_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProcessEvent_m_pid_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProcessEvent *arg1 = (wxProcessEvent *) 0 ;
     int result;
@@ -9709,14 +9833,14 @@ static PyObject *_wrap_ProcessEvent_m_pid_get(PyObject *self, PyObject *args, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_pid);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ProcessEvent_m_exitcode_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProcessEvent_m_exitcode_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProcessEvent *arg1 = (wxProcessEvent *) 0 ;
     int arg2 ;
@@ -9729,7 +9853,7 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_set(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ProcessEvent_m_exitcode_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxProcessEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_exitcode = arg2;
     
@@ -9740,7 +9864,7 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_set(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ProcessEvent_m_exitcode_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProcessEvent_m_exitcode_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProcessEvent *arg1 = (wxProcessEvent *) 0 ;
     int result;
@@ -9754,21 +9878,21 @@ static PyObject *_wrap_ProcessEvent_m_exitcode_get(PyObject *self, PyObject *arg
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_exitcode);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * ProcessEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ProcessEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxProcessEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Execute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     int arg2 = (int) wxEXEC_ASYNC ;
@@ -9789,7 +9913,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs)
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -9804,7 +9928,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp1)
         delete arg1;
@@ -9819,7 +9943,7 @@ static PyObject *_wrap_Execute(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 
-static PyObject *_wrap_new_Joystick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Joystick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxJOYSTICK1 ;
     wxJoystick *result;
@@ -9830,7 +9954,7 @@ static PyObject *_wrap_new_Joystick(PyObject *self, PyObject *args, PyObject *kw
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Joystick",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9848,7 +9972,7 @@ static PyObject *_wrap_new_Joystick(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_Joystick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Joystick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9873,7 +9997,7 @@ static PyObject *_wrap_delete_Joystick(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Joystick_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     wxPoint result;
@@ -9903,7 +10027,7 @@ static PyObject *_wrap_Joystick_GetPosition(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Joystick_GetZPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetZPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -9922,14 +10046,14 @@ static PyObject *_wrap_Joystick_GetZPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetButtonState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetButtonState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -9948,14 +10072,14 @@ static PyObject *_wrap_Joystick_GetButtonState(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetPOVPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetPOVPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -9974,14 +10098,14 @@ static PyObject *_wrap_Joystick_GetPOVPosition(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetPOVCTSPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetPOVCTSPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10000,14 +10124,14 @@ static PyObject *_wrap_Joystick_GetPOVCTSPosition(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetRudderPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetRudderPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10026,14 +10150,14 @@ static PyObject *_wrap_Joystick_GetRudderPosition(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetUPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetUPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10052,14 +10176,14 @@ static PyObject *_wrap_Joystick_GetUPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetVPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetVPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10078,14 +10202,14 @@ static PyObject *_wrap_Joystick_GetVPosition(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetMovementThreshold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetMovementThreshold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10104,14 +10228,14 @@ static PyObject *_wrap_Joystick_GetMovementThreshold(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_SetMovementThreshold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_SetMovementThreshold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int arg2 ;
@@ -10124,7 +10248,7 @@ static PyObject *_wrap_Joystick_SetMovementThreshold(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Joystick_SetMovementThreshold",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystick,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10140,7 +10264,7 @@ static PyObject *_wrap_Joystick_SetMovementThreshold(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Joystick_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10168,7 +10292,7 @@ static PyObject *_wrap_Joystick_IsOk(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Joystick_GetNumberJoysticks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetNumberJoysticks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10187,14 +10311,14 @@ static PyObject *_wrap_Joystick_GetNumberJoysticks(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetManufacturerId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetManufacturerId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10213,14 +10337,14 @@ static PyObject *_wrap_Joystick_GetManufacturerId(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetProductId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetProductId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10239,14 +10363,14 @@ static PyObject *_wrap_Joystick_GetProductId(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetProductName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetProductName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     wxString result;
@@ -10278,7 +10402,7 @@ static PyObject *_wrap_Joystick_GetProductName(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Joystick_GetXMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetXMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10297,14 +10421,14 @@ static PyObject *_wrap_Joystick_GetXMin(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetYMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetYMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10323,14 +10447,14 @@ static PyObject *_wrap_Joystick_GetYMin(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetZMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetZMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10349,14 +10473,14 @@ static PyObject *_wrap_Joystick_GetZMin(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetXMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetXMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10375,14 +10499,14 @@ static PyObject *_wrap_Joystick_GetXMax(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetYMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetYMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10401,14 +10525,14 @@ static PyObject *_wrap_Joystick_GetYMax(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetZMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetZMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10427,14 +10551,14 @@ static PyObject *_wrap_Joystick_GetZMax(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetNumberButtons(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetNumberButtons(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10453,14 +10577,14 @@ static PyObject *_wrap_Joystick_GetNumberButtons(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetNumberAxes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetNumberAxes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10479,14 +10603,14 @@ static PyObject *_wrap_Joystick_GetNumberAxes(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetMaxButtons(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetMaxButtons(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10505,14 +10629,14 @@ static PyObject *_wrap_Joystick_GetMaxButtons(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetMaxAxes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetMaxAxes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10531,14 +10655,14 @@ static PyObject *_wrap_Joystick_GetMaxAxes(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetPollingMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetPollingMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10557,14 +10681,14 @@ static PyObject *_wrap_Joystick_GetPollingMin(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetPollingMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetPollingMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10583,14 +10707,14 @@ static PyObject *_wrap_Joystick_GetPollingMax(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetRudderMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetRudderMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10609,14 +10733,14 @@ static PyObject *_wrap_Joystick_GetRudderMin(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetRudderMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetRudderMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10635,14 +10759,14 @@ static PyObject *_wrap_Joystick_GetRudderMax(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetUMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetUMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10661,14 +10785,14 @@ static PyObject *_wrap_Joystick_GetUMin(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetUMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetUMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10687,14 +10811,14 @@ static PyObject *_wrap_Joystick_GetUMax(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetVMin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetVMin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10713,14 +10837,14 @@ static PyObject *_wrap_Joystick_GetVMin(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_GetVMax(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_GetVMax(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     int result;
@@ -10739,14 +10863,14 @@ static PyObject *_wrap_Joystick_GetVMax(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Joystick_HasRudder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasRudder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10774,7 +10898,7 @@ static PyObject *_wrap_Joystick_HasRudder(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Joystick_HasZ(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasZ(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10802,7 +10926,7 @@ static PyObject *_wrap_Joystick_HasZ(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Joystick_HasU(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasU(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10830,7 +10954,7 @@ static PyObject *_wrap_Joystick_HasU(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Joystick_HasV(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasV(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10858,7 +10982,7 @@ static PyObject *_wrap_Joystick_HasV(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Joystick_HasPOV(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasPOV(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10886,7 +11010,7 @@ static PyObject *_wrap_Joystick_HasPOV(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10914,7 +11038,7 @@ static PyObject *_wrap_Joystick_HasPOV4Dir(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -10942,7 +11066,7 @@ static PyObject *_wrap_Joystick_HasPOVCTS(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_SetCapture(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -10961,7 +11085,7 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10980,7 +11104,7 @@ static PyObject *_wrap_Joystick_SetCapture(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystick *arg1 = (wxJoystick *) 0 ;
     bool result;
@@ -11008,14 +11132,14 @@ static PyObject *_wrap_Joystick_ReleaseCapture(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * Joystick_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Joystick_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxJoystick, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_JoystickEvent_m_pos_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_pos_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     wxPoint *arg2 = (wxPoint *) 0 ;
@@ -11039,7 +11163,7 @@ static PyObject *_wrap_JoystickEvent_m_pos_set(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_pos_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_pos_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     wxPoint *result;
@@ -11060,7 +11184,7 @@ static PyObject *_wrap_JoystickEvent_m_pos_get(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11073,7 +11197,7 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_zPosition_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_zPosition = arg2;
     
@@ -11084,7 +11208,7 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_zPosition_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_zPosition_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11098,14 +11222,14 @@ static PyObject *_wrap_JoystickEvent_m_zPosition_get(PyObject *self, PyObject *a
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_zPosition);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11118,7 +11242,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonChange_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_buttonChange = arg2;
     
@@ -11129,7 +11253,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_buttonChange_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_buttonChange_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11143,14 +11267,14 @@ static PyObject *_wrap_JoystickEvent_m_buttonChange_get(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_buttonChange);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11163,7 +11287,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonState_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_buttonState = arg2;
     
@@ -11174,7 +11298,7 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_buttonState_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_buttonState_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11188,14 +11312,14 @@ static PyObject *_wrap_JoystickEvent_m_buttonState_get(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_buttonState);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11208,7 +11332,7 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_joyStick_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->m_joyStick = arg2;
     
@@ -11219,7 +11343,7 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_JoystickEvent_m_joyStick_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_m_joyStick_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11233,14 +11357,14 @@ static PyObject *_wrap_JoystickEvent_m_joyStick_get(PyObject *self, PyObject *ar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->m_joyStick);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_new_JoystickEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_JoystickEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -11257,19 +11381,19 @@ static PyObject *_wrap_new_JoystickEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_JoystickEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11286,7 +11410,7 @@ static PyObject *_wrap_new_JoystickEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_JoystickEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     wxPoint result;
@@ -11316,7 +11440,7 @@ static PyObject *_wrap_JoystickEvent_GetPosition(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_JoystickEvent_GetZPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_GetZPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11335,14 +11459,14 @@ static PyObject *_wrap_JoystickEvent_GetZPosition(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_GetButtonState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_GetButtonState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11361,14 +11485,14 @@ static PyObject *_wrap_JoystickEvent_GetButtonState(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_GetButtonChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_GetButtonChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11387,14 +11511,14 @@ static PyObject *_wrap_JoystickEvent_GetButtonChange(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_GetJoystick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_GetJoystick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int result;
@@ -11413,14 +11537,14 @@ static PyObject *_wrap_JoystickEvent_GetJoystick(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_JoystickEvent_SetJoystick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_SetJoystick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11433,7 +11557,7 @@ static PyObject *_wrap_JoystickEvent_SetJoystick(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetJoystick",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11449,7 +11573,7 @@ static PyObject *_wrap_JoystickEvent_SetJoystick(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_JoystickEvent_SetButtonState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_SetButtonState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11462,7 +11586,7 @@ static PyObject *_wrap_JoystickEvent_SetButtonState(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetButtonState",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11478,7 +11602,7 @@ static PyObject *_wrap_JoystickEvent_SetButtonState(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_JoystickEvent_SetButtonChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_SetButtonChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11491,7 +11615,7 @@ static PyObject *_wrap_JoystickEvent_SetButtonChange(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetButtonChange",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11507,7 +11631,7 @@ static PyObject *_wrap_JoystickEvent_SetButtonChange(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_JoystickEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -11539,7 +11663,7 @@ static PyObject *_wrap_JoystickEvent_SetPosition(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_JoystickEvent_SetZPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_SetZPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 ;
@@ -11552,7 +11676,7 @@ static PyObject *_wrap_JoystickEvent_SetZPosition(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_SetZPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11568,7 +11692,7 @@ static PyObject *_wrap_JoystickEvent_SetZPosition(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_JoystickEvent_IsButton(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_IsButton(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     bool result;
@@ -11596,7 +11720,7 @@ static PyObject *_wrap_JoystickEvent_IsButton(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_JoystickEvent_IsMove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_IsMove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     bool result;
@@ -11624,7 +11748,7 @@ static PyObject *_wrap_JoystickEvent_IsMove(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     bool result;
@@ -11652,7 +11776,7 @@ static PyObject *_wrap_JoystickEvent_IsZMove(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 = (int) wxJOY_BUTTON_ANY ;
@@ -11667,7 +11791,7 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11686,7 +11810,7 @@ static PyObject *_wrap_JoystickEvent_ButtonDown(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 = (int) wxJOY_BUTTON_ANY ;
@@ -11701,7 +11825,7 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11720,7 +11844,7 @@ static PyObject *_wrap_JoystickEvent_ButtonUp(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ;
     int arg2 = (int) wxJOY_BUTTON_ANY ;
@@ -11735,7 +11859,7 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxJoystickEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11754,14 +11878,14 @@ static PyObject *_wrap_JoystickEvent_ButtonIsDown(PyObject *self, PyObject *args
 }
 
 
-static PyObject * JoystickEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * JoystickEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxJoystickEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Sound(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Sound(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -11803,7 +11927,7 @@ static PyObject *_wrap_new_Sound(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_new_SoundFromData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SoundFromData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     wxSound *result;
@@ -11829,7 +11953,7 @@ static PyObject *_wrap_new_SoundFromData(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_delete_Sound(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Sound(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSound *arg1 = (wxSound *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11854,7 +11978,7 @@ static PyObject *_wrap_delete_Sound(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Sound_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sound_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSound *arg1 = (wxSound *) 0 ;
     wxString *arg2 = 0 ;
@@ -11898,7 +12022,7 @@ static PyObject *_wrap_Sound_Create(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Sound_CreateFromData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sound_CreateFromData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSound *arg1 = (wxSound *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -11929,7 +12053,7 @@ static PyObject *_wrap_Sound_CreateFromData(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Sound_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sound_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSound *arg1 = (wxSound *) 0 ;
     bool result;
@@ -11957,7 +12081,7 @@ static PyObject *_wrap_Sound_IsOk(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sound_Play(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSound *arg1 = (wxSound *) 0 ;
     unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ;
@@ -11972,7 +12096,7 @@ static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSound,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+        arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11992,7 +12116,7 @@ static PyObject *_wrap_Sound_Play(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sound_PlaySound(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     unsigned int arg2 = (unsigned int) wxSOUND_ASYNC ;
@@ -12011,7 +12135,7 @@ static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args, PyObject
         temp1 = True;
     }
     if (obj1) {
-        arg2 = (unsigned int) SWIG_AsUnsignedInt(obj1); 
+        arg2 = (unsigned int)SWIG_As_unsigned_SS_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12039,7 +12163,7 @@ static PyObject *_wrap_Sound_PlaySound(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Sound_Stop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Sound_Stop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -12061,14 +12185,14 @@ static PyObject *_wrap_Sound_Stop(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject * Sound_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Sound_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSound, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileTypeInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileTypeInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -12154,7 +12278,7 @@ static PyObject *_wrap_new_FileTypeInfo(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxArrayString *arg1 = 0 ;
     wxFileTypeInfo *result;
@@ -12206,7 +12330,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_NullFileTypeInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_NullFileTypeInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *result;
     char *kwnames[] = {
@@ -12228,7 +12352,7 @@ static PyObject *_wrap_new_NullFileTypeInfo(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileTypeInfo_IsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_IsValid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     bool result;
@@ -12256,7 +12380,7 @@ static PyObject *_wrap_FileTypeInfo_IsValid(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *arg2 = 0 ;
@@ -12278,7 +12402,7 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12303,7 +12427,7 @@ static PyObject *_wrap_FileTypeInfo_SetIcon(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *arg2 = 0 ;
@@ -12344,7 +12468,7 @@ static PyObject *_wrap_FileTypeInfo_SetShortDesc(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *result;
@@ -12379,7 +12503,7 @@ static PyObject *_wrap_FileTypeInfo_GetMimeType(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetOpenCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetOpenCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *result;
@@ -12414,7 +12538,7 @@ static PyObject *_wrap_FileTypeInfo_GetOpenCommand(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetPrintCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetPrintCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *result;
@@ -12449,7 +12573,7 @@ static PyObject *_wrap_FileTypeInfo_GetPrintCommand(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetShortDesc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetShortDesc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *result;
@@ -12484,7 +12608,7 @@ static PyObject *_wrap_FileTypeInfo_GetShortDesc(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetDescription(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetDescription(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *result;
@@ -12519,7 +12643,7 @@ static PyObject *_wrap_FileTypeInfo_GetDescription(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetExtensions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetExtensions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxArrayString *result;
@@ -12550,7 +12674,7 @@ static PyObject *_wrap_FileTypeInfo_GetExtensions(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetExtensionsCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetExtensionsCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     int result;
@@ -12569,14 +12693,14 @@ static PyObject *_wrap_FileTypeInfo_GetExtensionsCount(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetIconFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetIconFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     wxString *result;
@@ -12611,7 +12735,7 @@ static PyObject *_wrap_FileTypeInfo_GetIconFile(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileTypeInfo_GetIconIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileTypeInfo_GetIconIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = (wxFileTypeInfo *) 0 ;
     int result;
@@ -12630,21 +12754,21 @@ static PyObject *_wrap_FileTypeInfo_GetIconIndex(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * FileTypeInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileTypeInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileTypeInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileTypeInfo *arg1 = 0 ;
     wxFileType *result;
@@ -12675,7 +12799,7 @@ static PyObject *_wrap_new_FileType(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_FileType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FileType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12700,7 +12824,7 @@ static PyObject *_wrap_delete_FileType(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FileType_GetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     PyObject *result;
@@ -12726,7 +12850,7 @@ static PyObject *_wrap_FileType_GetMimeType(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileType_GetMimeTypes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetMimeTypes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     PyObject *result;
@@ -12752,7 +12876,7 @@ static PyObject *_wrap_FileType_GetMimeTypes(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_FileType_GetExtensions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetExtensions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     PyObject *result;
@@ -12778,7 +12902,7 @@ static PyObject *_wrap_FileType_GetExtensions(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FileType_GetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxIcon *result;
@@ -12804,7 +12928,7 @@ static PyObject *_wrap_FileType_GetIcon(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FileType_GetIconInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetIconInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     PyObject *result;
@@ -12830,7 +12954,7 @@ static PyObject *_wrap_FileType_GetIconInfo(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileType_GetDescription(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetDescription(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     PyObject *result;
@@ -12856,7 +12980,7 @@ static PyObject *_wrap_FileType_GetDescription(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileType_GetOpenCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetOpenCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxString *arg2 = 0 ;
@@ -12917,7 +13041,7 @@ static PyObject *_wrap_FileType_GetOpenCommand(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileType_GetPrintCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetPrintCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxString *arg2 = 0 ;
@@ -12978,7 +13102,7 @@ static PyObject *_wrap_FileType_GetPrintCommand(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileType_GetAllCommands(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_GetAllCommands(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxString *arg2 = 0 ;
@@ -13039,7 +13163,7 @@ static PyObject *_wrap_FileType_GetAllCommands(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_SetCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxString *arg2 = 0 ;
@@ -13070,7 +13194,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13105,7 +13229,7 @@ static PyObject *_wrap_FileType_SetCommand(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -13131,7 +13255,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P
         }
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13158,7 +13282,7 @@ static PyObject *_wrap_FileType_SetDefaultIcon(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileType_Unassociate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_Unassociate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileType *arg1 = (wxFileType *) 0 ;
     bool result;
@@ -13186,7 +13310,7 @@ static PyObject *_wrap_FileType_Unassociate(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FileType_ExpandCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileType_ExpandCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -13265,14 +13389,14 @@ static PyObject *_wrap_FileType_ExpandCommand(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * FileType_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileType_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileType, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_TheMimeTypesManager_set(PyObject *_val) {
+static int _wrap_TheMimeTypesManager_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TheMimeTypesManager is read-only.");
     return 1;
 }
@@ -13286,7 +13410,7 @@ static PyObject *_wrap_TheMimeTypesManager_get() {
 }
 
 
-static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -13342,7 +13466,7 @@ static PyObject *_wrap_MimeTypesManager_IsOfType(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_MimeTypesManager(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MimeTypesManager(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *result;
     char *kwnames[] = {
@@ -13364,7 +13488,7 @@ static PyObject *_wrap_new_MimeTypesManager(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     int arg2 = (int) wxMAILCAP_ALL ;
@@ -13382,7 +13506,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMimeTypesManager,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -13414,7 +13538,7 @@ static PyObject *_wrap_MimeTypesManager_Initialize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_MimeTypesManager_ClearData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_ClearData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13439,7 +13563,7 @@ static PyObject *_wrap_MimeTypesManager_ClearData(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
@@ -13481,7 +13605,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromExtension(PyObject *self,
 }
 
 
-static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
@@ -13523,7 +13647,7 @@ static PyObject *_wrap_MimeTypesManager_GetFileTypeFromMimeType(PyObject *self,
 }
 
 
-static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
@@ -13546,7 +13670,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13573,7 +13697,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMailcap(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxString *arg2 = 0 ;
@@ -13617,7 +13741,7 @@ static PyObject *_wrap_MimeTypesManager_ReadMimeTypes(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_MimeTypesManager_EnumAllFileTypes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_EnumAllFileTypes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     PyObject *result;
@@ -13643,7 +13767,7 @@ static PyObject *_wrap_MimeTypesManager_EnumAllFileTypes(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_MimeTypesManager_AddFallback(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_AddFallback(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxFileTypeInfo *arg2 = 0 ;
@@ -13677,7 +13801,7 @@ static PyObject *_wrap_MimeTypesManager_AddFallback(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_MimeTypesManager_Associate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_Associate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxFileTypeInfo *arg2 = 0 ;
@@ -13712,7 +13836,7 @@ static PyObject *_wrap_MimeTypesManager_Associate(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_MimeTypesManager_Unassociate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MimeTypesManager_Unassociate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     wxFileType *arg2 = (wxFileType *) 0 ;
@@ -13744,7 +13868,7 @@ static PyObject *_wrap_MimeTypesManager_Unassociate(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_delete_MimeTypesManager(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_MimeTypesManager(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMimeTypesManager *arg1 = (wxMimeTypesManager *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13769,14 +13893,14 @@ static PyObject *_wrap_delete_MimeTypesManager(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * MimeTypesManager_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MimeTypesManager_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMimeTypesManager, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_ART_TOOLBAR_set(PyObject *_val) {
+static int _wrap_ART_TOOLBAR_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_TOOLBAR is read-only.");
     return 1;
 }
@@ -13796,7 +13920,7 @@ static PyObject *_wrap_ART_TOOLBAR_get() {
 }
 
 
-static int _wrap_ART_MENU_set(PyObject *_val) {
+static int _wrap_ART_MENU_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_MENU is read-only.");
     return 1;
 }
@@ -13816,7 +13940,7 @@ static PyObject *_wrap_ART_MENU_get() {
 }
 
 
-static int _wrap_ART_FRAME_ICON_set(PyObject *_val) {
+static int _wrap_ART_FRAME_ICON_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_FRAME_ICON is read-only.");
     return 1;
 }
@@ -13836,7 +13960,7 @@ static PyObject *_wrap_ART_FRAME_ICON_get() {
 }
 
 
-static int _wrap_ART_CMN_DIALOG_set(PyObject *_val) {
+static int _wrap_ART_CMN_DIALOG_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_CMN_DIALOG is read-only.");
     return 1;
 }
@@ -13856,7 +13980,7 @@ static PyObject *_wrap_ART_CMN_DIALOG_get() {
 }
 
 
-static int _wrap_ART_HELP_BROWSER_set(PyObject *_val) {
+static int _wrap_ART_HELP_BROWSER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_BROWSER is read-only.");
     return 1;
 }
@@ -13876,7 +14000,7 @@ static PyObject *_wrap_ART_HELP_BROWSER_get() {
 }
 
 
-static int _wrap_ART_MESSAGE_BOX_set(PyObject *_val) {
+static int _wrap_ART_MESSAGE_BOX_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_MESSAGE_BOX is read-only.");
     return 1;
 }
@@ -13896,7 +14020,7 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() {
 }
 
 
-static int _wrap_ART_BUTTON_set(PyObject *_val) {
+static int _wrap_ART_BUTTON_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_BUTTON is read-only.");
     return 1;
 }
@@ -13916,7 +14040,7 @@ static PyObject *_wrap_ART_BUTTON_get() {
 }
 
 
-static int _wrap_ART_OTHER_set(PyObject *_val) {
+static int _wrap_ART_OTHER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only.");
     return 1;
 }
@@ -13936,7 +14060,7 @@ static PyObject *_wrap_ART_OTHER_get() {
 }
 
 
-static int _wrap_ART_ADD_BOOKMARK_set(PyObject *_val) {
+static int _wrap_ART_ADD_BOOKMARK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_ADD_BOOKMARK is read-only.");
     return 1;
 }
@@ -13956,7 +14080,7 @@ static PyObject *_wrap_ART_ADD_BOOKMARK_get() {
 }
 
 
-static int _wrap_ART_DEL_BOOKMARK_set(PyObject *_val) {
+static int _wrap_ART_DEL_BOOKMARK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_DEL_BOOKMARK is read-only.");
     return 1;
 }
@@ -13976,7 +14100,7 @@ static PyObject *_wrap_ART_DEL_BOOKMARK_get() {
 }
 
 
-static int _wrap_ART_HELP_SIDE_PANEL_set(PyObject *_val) {
+static int _wrap_ART_HELP_SIDE_PANEL_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_SIDE_PANEL is read-only.");
     return 1;
 }
@@ -13996,7 +14120,7 @@ static PyObject *_wrap_ART_HELP_SIDE_PANEL_get() {
 }
 
 
-static int _wrap_ART_HELP_SETTINGS_set(PyObject *_val) {
+static int _wrap_ART_HELP_SETTINGS_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_SETTINGS is read-only.");
     return 1;
 }
@@ -14016,7 +14140,7 @@ static PyObject *_wrap_ART_HELP_SETTINGS_get() {
 }
 
 
-static int _wrap_ART_HELP_BOOK_set(PyObject *_val) {
+static int _wrap_ART_HELP_BOOK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_BOOK is read-only.");
     return 1;
 }
@@ -14036,7 +14160,7 @@ static PyObject *_wrap_ART_HELP_BOOK_get() {
 }
 
 
-static int _wrap_ART_HELP_FOLDER_set(PyObject *_val) {
+static int _wrap_ART_HELP_FOLDER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_FOLDER is read-only.");
     return 1;
 }
@@ -14056,7 +14180,7 @@ static PyObject *_wrap_ART_HELP_FOLDER_get() {
 }
 
 
-static int _wrap_ART_HELP_PAGE_set(PyObject *_val) {
+static int _wrap_ART_HELP_PAGE_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP_PAGE is read-only.");
     return 1;
 }
@@ -14076,7 +14200,7 @@ static PyObject *_wrap_ART_HELP_PAGE_get() {
 }
 
 
-static int _wrap_ART_GO_BACK_set(PyObject *_val) {
+static int _wrap_ART_GO_BACK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_BACK is read-only.");
     return 1;
 }
@@ -14096,7 +14220,7 @@ static PyObject *_wrap_ART_GO_BACK_get() {
 }
 
 
-static int _wrap_ART_GO_FORWARD_set(PyObject *_val) {
+static int _wrap_ART_GO_FORWARD_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_FORWARD is read-only.");
     return 1;
 }
@@ -14116,7 +14240,7 @@ static PyObject *_wrap_ART_GO_FORWARD_get() {
 }
 
 
-static int _wrap_ART_GO_UP_set(PyObject *_val) {
+static int _wrap_ART_GO_UP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_UP is read-only.");
     return 1;
 }
@@ -14136,7 +14260,7 @@ static PyObject *_wrap_ART_GO_UP_get() {
 }
 
 
-static int _wrap_ART_GO_DOWN_set(PyObject *_val) {
+static int _wrap_ART_GO_DOWN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DOWN is read-only.");
     return 1;
 }
@@ -14156,7 +14280,7 @@ static PyObject *_wrap_ART_GO_DOWN_get() {
 }
 
 
-static int _wrap_ART_GO_TO_PARENT_set(PyObject *_val) {
+static int _wrap_ART_GO_TO_PARENT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_TO_PARENT is read-only.");
     return 1;
 }
@@ -14176,7 +14300,7 @@ static PyObject *_wrap_ART_GO_TO_PARENT_get() {
 }
 
 
-static int _wrap_ART_GO_HOME_set(PyObject *_val) {
+static int _wrap_ART_GO_HOME_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_HOME is read-only.");
     return 1;
 }
@@ -14196,7 +14320,7 @@ static PyObject *_wrap_ART_GO_HOME_get() {
 }
 
 
-static int _wrap_ART_FILE_OPEN_set(PyObject *_val) {
+static int _wrap_ART_FILE_OPEN_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_FILE_OPEN is read-only.");
     return 1;
 }
@@ -14216,7 +14340,7 @@ static PyObject *_wrap_ART_FILE_OPEN_get() {
 }
 
 
-static int _wrap_ART_PRINT_set(PyObject *_val) {
+static int _wrap_ART_PRINT_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_PRINT is read-only.");
     return 1;
 }
@@ -14236,7 +14360,7 @@ static PyObject *_wrap_ART_PRINT_get() {
 }
 
 
-static int _wrap_ART_HELP_set(PyObject *_val) {
+static int _wrap_ART_HELP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_HELP is read-only.");
     return 1;
 }
@@ -14256,7 +14380,7 @@ static PyObject *_wrap_ART_HELP_get() {
 }
 
 
-static int _wrap_ART_TIP_set(PyObject *_val) {
+static int _wrap_ART_TIP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_TIP is read-only.");
     return 1;
 }
@@ -14276,7 +14400,7 @@ static PyObject *_wrap_ART_TIP_get() {
 }
 
 
-static int _wrap_ART_REPORT_VIEW_set(PyObject *_val) {
+static int _wrap_ART_REPORT_VIEW_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_REPORT_VIEW is read-only.");
     return 1;
 }
@@ -14296,7 +14420,7 @@ static PyObject *_wrap_ART_REPORT_VIEW_get() {
 }
 
 
-static int _wrap_ART_LIST_VIEW_set(PyObject *_val) {
+static int _wrap_ART_LIST_VIEW_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_LIST_VIEW is read-only.");
     return 1;
 }
@@ -14316,7 +14440,7 @@ static PyObject *_wrap_ART_LIST_VIEW_get() {
 }
 
 
-static int _wrap_ART_NEW_DIR_set(PyObject *_val) {
+static int _wrap_ART_NEW_DIR_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_NEW_DIR is read-only.");
     return 1;
 }
@@ -14336,7 +14460,7 @@ static PyObject *_wrap_ART_NEW_DIR_get() {
 }
 
 
-static int _wrap_ART_FOLDER_set(PyObject *_val) {
+static int _wrap_ART_FOLDER_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_FOLDER is read-only.");
     return 1;
 }
@@ -14356,7 +14480,7 @@ static PyObject *_wrap_ART_FOLDER_get() {
 }
 
 
-static int _wrap_ART_GO_DIR_UP_set(PyObject *_val) {
+static int _wrap_ART_GO_DIR_UP_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_GO_DIR_UP is read-only.");
     return 1;
 }
@@ -14376,7 +14500,7 @@ static PyObject *_wrap_ART_GO_DIR_UP_get() {
 }
 
 
-static int _wrap_ART_EXECUTABLE_FILE_set(PyObject *_val) {
+static int _wrap_ART_EXECUTABLE_FILE_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_EXECUTABLE_FILE is read-only.");
     return 1;
 }
@@ -14396,7 +14520,7 @@ static PyObject *_wrap_ART_EXECUTABLE_FILE_get() {
 }
 
 
-static int _wrap_ART_NORMAL_FILE_set(PyObject *_val) {
+static int _wrap_ART_NORMAL_FILE_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_NORMAL_FILE is read-only.");
     return 1;
 }
@@ -14416,7 +14540,7 @@ static PyObject *_wrap_ART_NORMAL_FILE_get() {
 }
 
 
-static int _wrap_ART_TICK_MARK_set(PyObject *_val) {
+static int _wrap_ART_TICK_MARK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_TICK_MARK is read-only.");
     return 1;
 }
@@ -14436,7 +14560,7 @@ static PyObject *_wrap_ART_TICK_MARK_get() {
 }
 
 
-static int _wrap_ART_CROSS_MARK_set(PyObject *_val) {
+static int _wrap_ART_CROSS_MARK_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_CROSS_MARK is read-only.");
     return 1;
 }
@@ -14456,7 +14580,7 @@ static PyObject *_wrap_ART_CROSS_MARK_get() {
 }
 
 
-static int _wrap_ART_ERROR_set(PyObject *_val) {
+static int _wrap_ART_ERROR_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_ERROR is read-only.");
     return 1;
 }
@@ -14476,7 +14600,7 @@ static PyObject *_wrap_ART_ERROR_get() {
 }
 
 
-static int _wrap_ART_QUESTION_set(PyObject *_val) {
+static int _wrap_ART_QUESTION_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_QUESTION is read-only.");
     return 1;
 }
@@ -14496,7 +14620,7 @@ static PyObject *_wrap_ART_QUESTION_get() {
 }
 
 
-static int _wrap_ART_WARNING_set(PyObject *_val) {
+static int _wrap_ART_WARNING_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_WARNING is read-only.");
     return 1;
 }
@@ -14516,7 +14640,7 @@ static PyObject *_wrap_ART_WARNING_get() {
 }
 
 
-static int _wrap_ART_INFORMATION_set(PyObject *_val) {
+static int _wrap_ART_INFORMATION_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_INFORMATION is read-only.");
     return 1;
 }
@@ -14536,7 +14660,7 @@ static PyObject *_wrap_ART_INFORMATION_get() {
 }
 
 
-static int _wrap_ART_MISSING_IMAGE_set(PyObject *_val) {
+static int _wrap_ART_MISSING_IMAGE_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ART_MISSING_IMAGE is read-only.");
     return 1;
 }
@@ -14556,7 +14680,7 @@ static PyObject *_wrap_ART_MISSING_IMAGE_get() {
 }
 
 
-static PyObject *_wrap_new_ArtProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ArtProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyArtProvider *result;
     char *kwnames[] = {
@@ -14579,7 +14703,7 @@ static PyObject *_wrap_new_ArtProvider(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ArtProvider__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -14610,7 +14734,7 @@ static PyObject *_wrap_ArtProvider__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ArtProvider_PushProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider_PushProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14635,7 +14759,7 @@ static PyObject *_wrap_ArtProvider_PushProvider(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ArtProvider_PopProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider_PopProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool result;
     char *kwnames[] = {
@@ -14659,7 +14783,7 @@ static PyObject *_wrap_ArtProvider_PopProvider(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
     bool result;
@@ -14687,7 +14811,7 @@ static PyObject *_wrap_ArtProvider_RemoveProvider(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyART_OTHER ;
@@ -14759,7 +14883,7 @@ static PyObject *_wrap_ArtProvider_GetBitmap(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider_GetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyART_OTHER ;
@@ -14831,7 +14955,7 @@ static PyObject *_wrap_ArtProvider_GetIcon(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ArtProvider_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ArtProvider_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyArtProvider *arg1 = (wxPyArtProvider *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14856,14 +14980,14 @@ static PyObject *_wrap_ArtProvider_Destroy(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * ArtProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ArtProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyArtProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_delete_ConfigBase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ConfigBase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14888,7 +15012,7 @@ static PyObject *_wrap_delete_ConfigBase(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ConfigBase_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxConfigBase *result;
@@ -14914,7 +15038,7 @@ static PyObject *_wrap_ConfigBase_Set(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     bool arg1 = (bool) True ;
     wxConfigBase *result;
@@ -14925,7 +15049,7 @@ static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ConfigBase_Get",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (bool) SWIG_AsBool(obj0); 
+        arg1 = (bool)SWIG_As_bool(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14942,7 +15066,7 @@ static PyObject *_wrap_ConfigBase_Get(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_ConfigBase_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *result;
     char *kwnames[] = {
@@ -14964,7 +15088,7 @@ static PyObject *_wrap_ConfigBase_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ConfigBase_DontCreateOnDemand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_DontCreateOnDemand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -14985,7 +15109,7 @@ static PyObject *_wrap_ConfigBase_DontCreateOnDemand(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ConfigBase_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_SetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15026,7 +15150,7 @@ static PyObject *_wrap_ConfigBase_SetPath(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ConfigBase_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *result;
@@ -15061,7 +15185,7 @@ static PyObject *_wrap_ConfigBase_GetPath(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ConfigBase_GetFirstGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetFirstGroup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     PyObject *result;
@@ -15087,7 +15211,7 @@ static PyObject *_wrap_ConfigBase_GetFirstGroup(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ConfigBase_GetNextGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetNextGroup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     long arg2 ;
@@ -15101,7 +15225,7 @@ static PyObject *_wrap_ConfigBase_GetNextGroup(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_GetNextGroup",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15117,7 +15241,7 @@ static PyObject *_wrap_ConfigBase_GetNextGroup(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ConfigBase_GetFirstEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetFirstEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     PyObject *result;
@@ -15143,7 +15267,7 @@ static PyObject *_wrap_ConfigBase_GetFirstEntry(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     long arg2 ;
@@ -15157,7 +15281,7 @@ static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_GetNextEntry",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15173,7 +15297,7 @@ static PyObject *_wrap_ConfigBase_GetNextEntry(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool arg2 = (bool) False ;
@@ -15188,7 +15312,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15198,14 +15322,14 @@ static PyObject *_wrap_ConfigBase_GetNumberOfEntries(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool arg2 = (bool) False ;
@@ -15220,7 +15344,7 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15230,14 +15354,14 @@ static PyObject *_wrap_ConfigBase_GetNumberOfGroups(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_HasGroup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15281,7 +15405,7 @@ static PyObject *_wrap_ConfigBase_HasGroup(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_HasEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15325,7 +15449,7 @@ static PyObject *_wrap_ConfigBase_HasEntry(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Exists(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15369,7 +15493,7 @@ static PyObject *_wrap_ConfigBase_Exists(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15396,7 +15520,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -15411,7 +15535,7 @@ static PyObject *_wrap_ConfigBase_GetEntryType(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ConfigBase_Read(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Read(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15478,7 +15602,7 @@ static PyObject *_wrap_ConfigBase_Read(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_ReadInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15501,7 +15625,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15511,7 +15635,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     {
         if (temp2)
         delete arg2;
@@ -15526,7 +15650,7 @@ static PyObject *_wrap_ConfigBase_ReadInt(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15549,7 +15673,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (double) SWIG_AsDouble(obj2); 
+        arg3 = (double)SWIG_As_double(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15559,7 +15683,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     {
         if (temp2)
         delete arg2;
@@ -15574,7 +15698,7 @@ static PyObject *_wrap_ConfigBase_ReadFloat(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_ReadBool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15597,7 +15721,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15624,7 +15748,7 @@ static PyObject *_wrap_ConfigBase_ReadBool(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Write(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15684,7 +15808,7 @@ static PyObject *_wrap_ConfigBase_Write(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_WriteInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15706,7 +15830,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15732,7 +15856,7 @@ static PyObject *_wrap_ConfigBase_WriteInt(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15754,7 +15878,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15780,7 +15904,7 @@ static PyObject *_wrap_ConfigBase_WriteFloat(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_WriteBool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15802,7 +15926,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15828,7 +15952,7 @@ static PyObject *_wrap_ConfigBase_WriteBool(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_Flush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool arg2 = (bool) False ;
@@ -15843,7 +15967,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15862,7 +15986,7 @@ static PyObject *_wrap_ConfigBase_Flush(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15922,7 +16046,7 @@ static PyObject *_wrap_ConfigBase_RenameEntry(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -15982,7 +16106,7 @@ static PyObject *_wrap_ConfigBase_RenameGroup(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16005,7 +16129,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16032,7 +16156,7 @@ static PyObject *_wrap_ConfigBase_DeleteEntry(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16076,7 +16200,7 @@ static PyObject *_wrap_ConfigBase_DeleteGroup(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ConfigBase_DeleteAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_DeleteAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool result;
@@ -16104,7 +16228,7 @@ static PyObject *_wrap_ConfigBase_DeleteAll(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool arg2 = (bool) True ;
@@ -16118,7 +16242,7 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16135,7 +16259,7 @@ static PyObject *_wrap_ConfigBase_SetExpandEnvVars(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool result;
@@ -16163,7 +16287,7 @@ static PyObject *_wrap_ConfigBase_IsExpandingEnvVars(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool arg2 = (bool) True ;
@@ -16177,7 +16301,7 @@ static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *ar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16194,7 +16318,7 @@ static PyObject *_wrap_ConfigBase_SetRecordDefaults(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ConfigBase_IsRecordingDefaults(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_IsRecordingDefaults(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     bool result;
@@ -16222,7 +16346,7 @@ static PyObject *_wrap_ConfigBase_IsRecordingDefaults(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16270,7 +16394,7 @@ static PyObject *_wrap_ConfigBase_ExpandEnvVars(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ConfigBase_GetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString result;
@@ -16302,7 +16426,7 @@ static PyObject *_wrap_ConfigBase_GetAppName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ConfigBase_GetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString result;
@@ -16334,7 +16458,7 @@ static PyObject *_wrap_ConfigBase_GetVendorName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ConfigBase_SetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_SetAppName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16375,7 +16499,7 @@ static PyObject *_wrap_ConfigBase_SetAppName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16416,7 +16540,7 @@ static PyObject *_wrap_ConfigBase_SetVendorName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ConfigBase_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     long arg2 ;
@@ -16429,7 +16553,7 @@ static PyObject *_wrap_ConfigBase_SetStyle(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ConfigBase_SetStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxConfigBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16445,7 +16569,7 @@ static PyObject *_wrap_ConfigBase_SetStyle(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_ConfigBase_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigBase_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     long result;
@@ -16464,21 +16588,21 @@ static PyObject *_wrap_ConfigBase_GetStyle(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * ConfigBase_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ConfigBase_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxConfigBase, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Config(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -16533,7 +16657,7 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16582,7 +16706,7 @@ static PyObject *_wrap_new_Config(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_delete_Config(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Config(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfig *arg1 = (wxConfig *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16607,14 +16731,14 @@ static PyObject *_wrap_delete_Config(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject * Config_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Config_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxConfig, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileConfig(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -16669,7 +16793,7 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16718,7 +16842,7 @@ static PyObject *_wrap_new_FileConfig(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_FileConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FileConfig(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileConfig *arg1 = (wxFileConfig *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16743,14 +16867,14 @@ static PyObject *_wrap_delete_FileConfig(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * FileConfig_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileConfig_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileConfig, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ConfigPathChanger(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ConfigPathChanger(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigBase *arg1 = (wxConfigBase *) 0 ;
     wxString *arg2 = 0 ;
@@ -16792,7 +16916,7 @@ static PyObject *_wrap_new_ConfigPathChanger(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_delete_ConfigPathChanger(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ConfigPathChanger(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigPathChanger *arg1 = (wxConfigPathChanger *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16817,7 +16941,7 @@ static PyObject *_wrap_delete_ConfigPathChanger(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ConfigPathChanger_Name(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ConfigPathChanger_Name(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxConfigPathChanger *arg1 = (wxConfigPathChanger *) 0 ;
     wxString *result;
@@ -16852,14 +16976,14 @@ static PyObject *_wrap_ConfigPathChanger_Name(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * ConfigPathChanger_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ConfigPathChanger_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxConfigPathChanger, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ExpandEnvVars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString result;
@@ -16903,7 +17027,7 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static int _wrap_DateFormatStr_set(PyObject *_val) {
+static int _wrap_DateFormatStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only.");
     return 1;
 }
@@ -16923,7 +17047,7 @@ static PyObject *_wrap_DateFormatStr_get() {
 }
 
 
-static int _wrap_TimeSpanFormatStr_set(PyObject *_val) {
+static int _wrap_TimeSpanFormatStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only.");
     return 1;
 }
@@ -16943,7 +17067,7 @@ static PyObject *_wrap_TimeSpanFormatStr_get() {
 }
 
 
-static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetCountry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     PyObject * obj0 = 0 ;
@@ -16952,7 +17076,7 @@ static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateTime_SetCountry",kwnames,&obj0)) goto fail;
-    arg1 = (wxDateTime::Country) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16968,7 +17092,7 @@ static PyObject *_wrap_DateTime_SetCountry(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_GetCountry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetCountry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -16983,14 +17107,14 @@ static PyObject *_wrap_DateTime_GetCountry(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Country_Default ;
     bool result;
@@ -17001,7 +17125,7 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_IsWestEuropeanCountry",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxDateTime::Country) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17020,7 +17144,7 @@ static PyObject *_wrap_DateTime_IsWestEuropeanCountry(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Gregorian ;
     int result;
@@ -17031,7 +17155,7 @@ static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, P
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCurrentYear",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxDateTime::Calendar) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17041,14 +17165,14 @@ static PyObject *_wrap_DateTime_GetCurrentYear(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int result;
@@ -17058,7 +17182,7 @@ static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateTime_ConvertYearToBC",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17067,14 +17191,14 @@ static PyObject *_wrap_DateTime_ConvertYearToBC(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Gregorian ;
     int result;
@@ -17085,7 +17209,7 @@ static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCurrentMonth",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxDateTime::Calendar) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17095,14 +17219,14 @@ static PyObject *_wrap_DateTime_GetCurrentMonth(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsLeapYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Inv_Year ;
     int arg2 = (int) wxDateTime::Gregorian ;
@@ -17115,11 +17239,11 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_IsLeapYear",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxDateTime::Calendar) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17138,7 +17262,7 @@ static PyObject *_wrap_DateTime_IsLeapYear(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetCentury(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Inv_Year ;
     int result;
@@ -17149,7 +17273,7 @@ static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:DateTime_GetCentury",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17159,14 +17283,14 @@ static PyObject *_wrap_DateTime_GetCentury(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxDateTime::Gregorian ;
@@ -17178,10 +17302,10 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetNumberOfDaysinYear",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::Calendar) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17191,14 +17315,14 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysinYear(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxDateTime::Inv_Year ;
@@ -17212,14 +17336,14 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:DateTime_GetNumberOfDaysInMonth",kwnames,&obj0,&obj1,&obj2)) goto fail;
-    arg1 = (wxDateTime::Month) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (wxDateTime::Calendar) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17229,14 +17353,14 @@ static PyObject *_wrap_DateTime_GetNumberOfDaysInMonth(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetMonthName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetMonthName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxDateTime::Name_Full ;
@@ -17248,10 +17372,10 @@ static PyObject *_wrap_DateTime_GetMonthName(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetMonthName",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (wxDateTime::Month) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::NameFlags) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17274,7 +17398,7 @@ static PyObject *_wrap_DateTime_GetMonthName(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_GetWeekDayName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetWeekDayName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxDateTime::Name_Full ;
@@ -17286,10 +17410,10 @@ static PyObject *_wrap_DateTime_GetWeekDayName(PyObject *self, PyObject *args, P
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DateTime_GetWeekDayName",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (wxDateTime::WeekDay) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::NameFlags) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17312,7 +17436,7 @@ static PyObject *_wrap_DateTime_GetWeekDayName(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = (wxString *) 0 ;
     wxString *arg2 = (wxString *) 0 ;
@@ -17365,7 +17489,7 @@ static PyObject *_wrap_DateTime_GetAmPmStrings(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Inv_Year ;
     int arg2 = (int) wxDateTime::Country_Default ;
@@ -17378,11 +17502,11 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_IsDSTApplicable",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxDateTime::Country) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17401,7 +17525,7 @@ static PyObject *_wrap_DateTime_IsDSTApplicable(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DateTime_GetBeginDST(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetBeginDST(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Inv_Year ;
     int arg2 = (int) wxDateTime::Country_Default ;
@@ -17414,11 +17538,11 @@ static PyObject *_wrap_DateTime_GetBeginDST(PyObject *self, PyObject *args, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_GetBeginDST",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxDateTime::Country) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17439,7 +17563,7 @@ static PyObject *_wrap_DateTime_GetBeginDST(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DateTime_GetEndDST(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetEndDST(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxDateTime::Inv_Year ;
     int arg2 = (int) wxDateTime::Country_Default ;
@@ -17452,11 +17576,11 @@ static PyObject *_wrap_DateTime_GetEndDST(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:DateTime_GetEndDST",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxDateTime::Country) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17477,7 +17601,7 @@ static PyObject *_wrap_DateTime_GetEndDST(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_Now(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_Now(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime result;
     char *kwnames[] = {
@@ -17503,7 +17627,7 @@ static PyObject *_wrap_DateTime_Now(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DateTime_UNow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_UNow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime result;
     char *kwnames[] = {
@@ -17529,7 +17653,7 @@ static PyObject *_wrap_DateTime_UNow(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DateTime_Today(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_Today(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime result;
     char *kwnames[] = {
@@ -17555,7 +17679,7 @@ static PyObject *_wrap_DateTime_Today(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_DateTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *result;
     char *kwnames[] = {
@@ -17577,7 +17701,7 @@ static PyObject *_wrap_new_DateTime(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     time_t arg1 ;
     wxDateTime *result;
@@ -17587,7 +17711,7 @@ static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *self, PyObject *args, PyO
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromTimeT",kwnames,&obj0)) goto fail;
-    arg1 = (time_t) SWIG_AsUnsignedInt(obj0); 
+    arg1 = (time_t)SWIG_As_unsigned_SS_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17603,7 +17727,7 @@ static PyObject *_wrap_new_DateTimeFromTimeT(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_DateTimeFromJDN(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateTimeFromJDN(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     double arg1 ;
     wxDateTime *result;
@@ -17613,7 +17737,7 @@ static PyObject *_wrap_new_DateTimeFromJDN(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DateTimeFromJDN",kwnames,&obj0)) goto fail;
-    arg1 = (double) SWIG_AsDouble(obj0); 
+    arg1 = (double)SWIG_As_double(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17629,7 +17753,7 @@ static PyObject *_wrap_new_DateTimeFromJDN(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateTimeFromHMS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) 0 ;
@@ -17645,18 +17769,18 @@ static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DateTimeFromHMS",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17673,7 +17797,7 @@ static PyObject *_wrap_new_DateTimeFromHMS(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_DateTimeFromDMY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateTimeFromDMY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     int arg2 = (int) wxDateTime::Inv_Month ;
@@ -17695,30 +17819,30 @@ static PyObject *_wrap_new_DateTimeFromDMY(PyObject *self, PyObject *args, PyObj
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOOOOO:new_DateTimeFromDMY",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::Month) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17735,7 +17859,7 @@ static PyObject *_wrap_new_DateTimeFromDMY(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_delete_DateTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DateTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17760,7 +17884,7 @@ static PyObject *_wrap_delete_DateTime(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_SetToCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToCurrent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *result;
@@ -17789,7 +17913,7 @@ static PyObject *_wrap_DateTime_SetToCurrent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_SetTimeT(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetTimeT(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     time_t arg2 ;
@@ -17803,7 +17927,7 @@ static PyObject *_wrap_DateTime_SetTimeT(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetTimeT",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (time_t) SWIG_AsUnsignedInt(obj1); 
+    arg2 = (time_t)SWIG_As_unsigned_SS_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17822,7 +17946,7 @@ static PyObject *_wrap_DateTime_SetTimeT(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateTime_SetJDN(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetJDN(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     double arg2 ;
@@ -17836,7 +17960,7 @@ static PyObject *_wrap_DateTime_SetJDN(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetJDN",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17855,7 +17979,7 @@ static PyObject *_wrap_DateTime_SetJDN(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetHMS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -17875,18 +17999,18 @@ static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetHMS",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17906,7 +18030,7 @@ static PyObject *_wrap_DateTime_SetHMS(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -17932,30 +18056,30 @@ static PyObject *_wrap_DateTime_Set(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOOOO:DateTime_Set",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::Month) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17975,7 +18099,7 @@ static PyObject *_wrap_DateTime_Set(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DateTime_ResetTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ResetTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *result;
@@ -18004,7 +18128,7 @@ static PyObject *_wrap_DateTime_ResetTime(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_SetYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18018,7 +18142,7 @@ static PyObject *_wrap_DateTime_SetYear(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetYear",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18037,7 +18161,7 @@ static PyObject *_wrap_DateTime_SetYear(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_SetMonth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetMonth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18051,7 +18175,7 @@ static PyObject *_wrap_DateTime_SetMonth(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMonth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::Month) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18070,7 +18194,7 @@ static PyObject *_wrap_DateTime_SetMonth(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18084,7 +18208,7 @@ static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18103,7 +18227,7 @@ static PyObject *_wrap_DateTime_SetDay(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetHour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18117,7 +18241,7 @@ static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetHour",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18136,7 +18260,7 @@ static PyObject *_wrap_DateTime_SetHour(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetMinute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18150,7 +18274,7 @@ static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMinute",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18169,7 +18293,7 @@ static PyObject *_wrap_DateTime_SetMinute(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetSecond(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18183,7 +18307,7 @@ static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetSecond",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18202,7 +18326,7 @@ static PyObject *_wrap_DateTime_SetSecond(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_SetMillisecond(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetMillisecond(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18216,7 +18340,7 @@ static PyObject *_wrap_DateTime_SetMillisecond(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetMillisecond",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18235,7 +18359,7 @@ static PyObject *_wrap_DateTime_SetMillisecond(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_SetToWeekDayInSameWeek(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToWeekDayInSameWeek(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18251,10 +18375,10 @@ static PyObject *_wrap_DateTime_SetToWeekDayInSameWeek(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DateTime_SetToWeekDayInSameWeek",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::WeekFlags) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18274,7 +18398,7 @@ static PyObject *_wrap_DateTime_SetToWeekDayInSameWeek(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_GetWeekDayInSameWeek(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetWeekDayInSameWeek(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18290,10 +18414,10 @@ static PyObject *_wrap_DateTime_GetWeekDayInSameWeek(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:DateTime_GetWeekDayInSameWeek",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::WeekFlags) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18314,7 +18438,7 @@ static PyObject *_wrap_DateTime_GetWeekDayInSameWeek(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_DateTime_SetToNextWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToNextWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18328,7 +18452,7 @@ static PyObject *_wrap_DateTime_SetToNextWeekDay(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToNextWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18347,7 +18471,7 @@ static PyObject *_wrap_DateTime_SetToNextWeekDay(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DateTime_GetNextWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetNextWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18361,7 +18485,7 @@ static PyObject *_wrap_DateTime_GetNextWeekDay(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetNextWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18381,7 +18505,7 @@ static PyObject *_wrap_DateTime_GetNextWeekDay(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_SetToPrevWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToPrevWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18395,7 +18519,7 @@ static PyObject *_wrap_DateTime_SetToPrevWeekDay(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToPrevWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18414,7 +18538,7 @@ static PyObject *_wrap_DateTime_SetToPrevWeekDay(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DateTime_GetPrevWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetPrevWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18428,7 +18552,7 @@ static PyObject *_wrap_DateTime_GetPrevWeekDay(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetPrevWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18448,7 +18572,7 @@ static PyObject *_wrap_DateTime_GetPrevWeekDay(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18468,18 +18592,18 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:DateTime_SetToWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (wxDateTime::Month) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18498,7 +18622,7 @@ static PyObject *_wrap_DateTime_SetToWeekDay(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18516,14 +18640,14 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToLastWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::Month) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18542,7 +18666,7 @@ static PyObject *_wrap_DateTime_SetToLastWeekDay(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18560,14 +18684,14 @@ static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetLastWeekDay",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::Month) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18588,7 +18712,7 @@ static PyObject *_wrap_DateTime_GetLastWeekDay(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18606,14 +18730,14 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_SetToTheWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::WeekDay) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (wxDateTime::WeekFlags) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18632,7 +18756,7 @@ static PyObject *_wrap_DateTime_SetToTheWeek(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_GetWeek(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetWeek(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18650,14 +18774,14 @@ static PyObject *_wrap_DateTime_GetWeek(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:DateTime_GetWeek",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (wxDateTime::WeekDay) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (wxDateTime::WeekFlags) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18678,7 +18802,7 @@ static PyObject *_wrap_DateTime_GetWeek(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_SetToLastMonthDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToLastMonthDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 = (int) wxDateTime::Inv_Month ;
@@ -18695,11 +18819,11 @@ static PyObject *_wrap_DateTime_SetToLastMonthDay(PyObject *self, PyObject *args
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::Month) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18719,7 +18843,7 @@ static PyObject *_wrap_DateTime_SetToLastMonthDay(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 = (int) wxDateTime::Inv_Month ;
@@ -18736,11 +18860,11 @@ static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::Month) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -18761,7 +18885,7 @@ static PyObject *_wrap_DateTime_GetLastMonthDay(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SetToYearDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18775,7 +18899,7 @@ static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_SetToYearDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18794,7 +18918,7 @@ static PyObject *_wrap_DateTime_SetToYearDay(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_GetYearDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetYearDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 ;
@@ -18808,7 +18932,7 @@ static PyObject *_wrap_DateTime_GetYearDay(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateTime_GetYearDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18828,7 +18952,7 @@ static PyObject *_wrap_DateTime_GetYearDay(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_GetJulianDayNumber(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetJulianDayNumber(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     double result;
@@ -18847,14 +18971,14 @@ static PyObject *_wrap_DateTime_GetJulianDayNumber(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetJDN(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetJDN(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     double result;
@@ -18873,14 +18997,14 @@ static PyObject *_wrap_DateTime_GetJDN(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetModifiedJulianDayNumber(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetModifiedJulianDayNumber(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     double result;
@@ -18899,14 +19023,14 @@ static PyObject *_wrap_DateTime_GetModifiedJulianDayNumber(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetMJD(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetMJD(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     double result;
@@ -18925,14 +19049,14 @@ static PyObject *_wrap_DateTime_GetMJD(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetRataDie(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetRataDie(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     double result;
@@ -18951,14 +19075,14 @@ static PyObject *_wrap_DateTime_GetRataDie(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ToTimezone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone *arg2 = 0 ;
@@ -18980,7 +19104,7 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19007,7 +19131,7 @@ static PyObject *_wrap_DateTime_ToTimezone(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_MakeTimezone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone *arg2 = 0 ;
@@ -19029,7 +19153,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19055,7 +19179,7 @@ static PyObject *_wrap_DateTime_MakeTimezone(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ToGMT(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     bool arg2 = (bool) False ;
@@ -19070,7 +19194,7 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19091,7 +19215,7 @@ static PyObject *_wrap_DateTime_ToGMT(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_MakeGMT(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     bool arg2 = (bool) False ;
@@ -19106,7 +19230,7 @@ static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19126,7 +19250,7 @@ static PyObject *_wrap_DateTime_MakeGMT(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsDST(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 = (int) wxDateTime::Country_Default ;
@@ -19141,7 +19265,7 @@ static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::Country) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19151,14 +19275,14 @@ static PyObject *_wrap_DateTime_IsDST(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_IsValid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsValid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     bool result;
@@ -19186,7 +19310,7 @@ static PyObject *_wrap_DateTime_IsValid(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_GetTicks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetTicks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     time_t result;
@@ -19205,14 +19329,14 @@ static PyObject *_wrap_DateTime_GetTicks(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19241,7 +19365,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19254,7 +19378,7 @@ static PyObject *_wrap_DateTime_GetYear(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetMonth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19283,7 +19407,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19296,7 +19420,7 @@ static PyObject *_wrap_DateTime_GetMonth(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19325,7 +19449,7 @@ static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19338,7 +19462,7 @@ static PyObject *_wrap_DateTime_GetDay(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19367,7 +19491,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19380,7 +19504,7 @@ static PyObject *_wrap_DateTime_GetWeekDay(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetHour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19409,7 +19533,7 @@ static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19422,7 +19546,7 @@ static PyObject *_wrap_DateTime_GetHour(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetMinute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19451,7 +19575,7 @@ static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19464,7 +19588,7 @@ static PyObject *_wrap_DateTime_GetMinute(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetSecond(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19493,7 +19617,7 @@ static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19506,7 +19630,7 @@ static PyObject *_wrap_DateTime_GetSecond(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetMillisecond(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19535,7 +19659,7 @@ static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19548,7 +19672,7 @@ static PyObject *_wrap_DateTime_GetMillisecond(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime::TimeZone const &arg2_defvalue = LOCAL_TZ ;
@@ -19577,7 +19701,7 @@ static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2) delete arg2;
     }
@@ -19590,7 +19714,7 @@ static PyObject *_wrap_DateTime_GetDayOfYear(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 = (int) wxDateTime::Monday_First ;
@@ -19609,7 +19733,7 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::WeekFlags) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -19625,7 +19749,7 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp3) delete arg3;
     }
@@ -19638,7 +19762,7 @@ static PyObject *_wrap_DateTime_GetWeekOfYear(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 = (int) wxDateTime::Monday_First ;
@@ -19657,7 +19781,7 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::WeekFlags) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -19673,7 +19797,7 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp3) delete arg3;
     }
@@ -19686,7 +19810,7 @@ static PyObject *_wrap_DateTime_GetWeekOfMonth(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsWorkDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     int arg2 = (int) wxDateTime::Country_Default ;
@@ -19701,7 +19825,7 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDateTime::Country) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -19720,7 +19844,7 @@ static PyObject *_wrap_DateTime_IsWorkDay(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_IsEqualTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsEqualTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19757,7 +19881,7 @@ static PyObject *_wrap_DateTime_IsEqualTo(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_IsEarlierThan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsEarlierThan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19794,7 +19918,7 @@ static PyObject *_wrap_DateTime_IsEarlierThan(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DateTime_IsLaterThan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsLaterThan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19831,7 +19955,7 @@ static PyObject *_wrap_DateTime_IsLaterThan(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DateTime_IsStrictlyBetween(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsStrictlyBetween(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19877,7 +20001,7 @@ static PyObject *_wrap_DateTime_IsStrictlyBetween(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DateTime_IsBetween(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsBetween(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19923,7 +20047,7 @@ static PyObject *_wrap_DateTime_IsBetween(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_IsSameDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsSameDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19960,7 +20084,7 @@ static PyObject *_wrap_DateTime_IsSameDate(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_IsSameTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsSameTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -19997,7 +20121,7 @@ static PyObject *_wrap_DateTime_IsSameTime(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_IsEqualUpTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_IsEqualUpTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -20043,7 +20167,7 @@ static PyObject *_wrap_DateTime_IsEqualUpTo(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DateTime_AddTS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_AddTS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -20081,7 +20205,7 @@ static PyObject *_wrap_DateTime_AddTS(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DateTime_AddDS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_AddDS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -20119,7 +20243,7 @@ static PyObject *_wrap_DateTime_AddDS(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DateTime_SubtractTS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SubtractTS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -20157,7 +20281,7 @@ static PyObject *_wrap_DateTime_SubtractTS(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_SubtractDS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_SubtractDS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -20195,7 +20319,7 @@ static PyObject *_wrap_DateTime_SubtractDS(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_Subtract(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -20234,7 +20358,7 @@ static PyObject *_wrap_DateTime_Subtract(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateTime___iadd____SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___iadd____SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -20244,7 +20368,7 @@ static PyObject *_wrap_DateTime___iadd____SWIG_0(PyObject *self, PyObject *args)
     
     if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___iadd__",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -20262,14 +20386,14 @@ static PyObject *_wrap_DateTime___iadd____SWIG_0(PyObject *self, PyObject *args)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime___iadd____SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___iadd____SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -20279,7 +20403,7 @@ static PyObject *_wrap_DateTime___iadd____SWIG_1(PyObject *self, PyObject *args)
     
     if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___iadd__",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -20297,7 +20421,7 @@ static PyObject *_wrap_DateTime___iadd____SWIG_1(PyObject *self, PyObject *args)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 1);
     return resultobj;
     fail:
     return NULL;
@@ -20371,7 +20495,7 @@ static PyObject *_wrap_DateTime___iadd__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___isub____SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___isub____SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -20381,7 +20505,7 @@ static PyObject *_wrap_DateTime___isub____SWIG_0(PyObject *self, PyObject *args)
     
     if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___isub__",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -20399,14 +20523,14 @@ static PyObject *_wrap_DateTime___isub____SWIG_0(PyObject *self, PyObject *args)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateTime___isub____SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___isub____SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -20416,7 +20540,7 @@ static PyObject *_wrap_DateTime___isub____SWIG_1(PyObject *self, PyObject *args)
     
     if(!PyArg_ParseTuple(args,(char *)"OO:DateTime___isub__",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateTime,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -20434,7 +20558,7 @@ static PyObject *_wrap_DateTime___isub____SWIG_1(PyObject *self, PyObject *args)
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateTime, 1);
     return resultobj;
     fail:
     return NULL;
@@ -20508,7 +20632,7 @@ static PyObject *_wrap_DateTime___isub__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___add____SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___add____SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -20544,7 +20668,7 @@ static PyObject *_wrap_DateTime___add____SWIG_0(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_DateTime___add____SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___add____SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -20647,7 +20771,7 @@ static PyObject *_wrap_DateTime___add__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___sub____SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___sub____SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -20683,7 +20807,7 @@ static PyObject *_wrap_DateTime___sub____SWIG_0(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_DateTime___sub____SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___sub____SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -20719,7 +20843,7 @@ static PyObject *_wrap_DateTime___sub____SWIG_1(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_DateTime___sub____SWIG_2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___sub____SWIG_2(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -20848,7 +20972,7 @@ static PyObject *_wrap_DateTime___sub__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___lt__(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = (wxDateTime *) 0 ;
@@ -20877,7 +21001,7 @@ static PyObject *_wrap_DateTime___lt__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___le__(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = (wxDateTime *) 0 ;
@@ -20906,7 +21030,7 @@ static PyObject *_wrap_DateTime___le__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___gt__(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = (wxDateTime *) 0 ;
@@ -20935,7 +21059,7 @@ static PyObject *_wrap_DateTime___gt__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___ge__(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = (wxDateTime *) 0 ;
@@ -20964,7 +21088,7 @@ static PyObject *_wrap_DateTime___ge__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___eq__(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = (wxDateTime *) 0 ;
@@ -20993,7 +21117,7 @@ static PyObject *_wrap_DateTime___eq__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DateTime___ne__(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxDateTime *arg2 = (wxDateTime *) 0 ;
@@ -21022,7 +21146,7 @@ static PyObject *_wrap_DateTime___ne__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
@@ -21049,7 +21173,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -21064,7 +21188,7 @@ static PyObject *_wrap_DateTime_ParseRfc822Date(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ParseFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
@@ -21114,7 +21238,7 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -21137,7 +21261,7 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ParseDateTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
@@ -21164,7 +21288,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -21179,7 +21303,7 @@ static PyObject *_wrap_DateTime_ParseDateTime(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ParseDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
@@ -21206,7 +21330,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -21221,7 +21345,7 @@ static PyObject *_wrap_DateTime_ParseDate(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_ParseTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString *arg2 = 0 ;
@@ -21248,7 +21372,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     {
         if (temp2)
         delete arg2;
@@ -21263,7 +21387,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_Format(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString const &arg2_defvalue = wxPyDateFormatStr ;
@@ -21330,7 +21454,7 @@ static PyObject *_wrap_DateTime_Format(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateTime_FormatDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_FormatDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString result;
@@ -21362,7 +21486,7 @@ static PyObject *_wrap_DateTime_FormatDate(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_FormatTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_FormatTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString result;
@@ -21394,7 +21518,7 @@ static PyObject *_wrap_DateTime_FormatTime(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_DateTime_FormatISODate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_FormatISODate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString result;
@@ -21426,7 +21550,7 @@ static PyObject *_wrap_DateTime_FormatISODate(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DateTime_FormatISOTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateTime_FormatISOTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateTime *arg1 = (wxDateTime *) 0 ;
     wxString result;
@@ -21458,14 +21582,14 @@ static PyObject *_wrap_DateTime_FormatISOTime(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * DateTime_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DateTime_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDateTime, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_TimeSpan_Seconds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Seconds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxTimeSpan result;
@@ -21475,7 +21599,7 @@ static PyObject *_wrap_TimeSpan_Seconds(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Seconds",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21495,7 +21619,7 @@ static PyObject *_wrap_TimeSpan_Seconds(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_Second(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Second(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan result;
     char *kwnames[] = {
@@ -21521,7 +21645,7 @@ static PyObject *_wrap_TimeSpan_Second(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_Minutes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Minutes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxTimeSpan result;
@@ -21531,7 +21655,7 @@ static PyObject *_wrap_TimeSpan_Minutes(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Minutes",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21551,7 +21675,7 @@ static PyObject *_wrap_TimeSpan_Minutes(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_Minute(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Minute(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan result;
     char *kwnames[] = {
@@ -21577,7 +21701,7 @@ static PyObject *_wrap_TimeSpan_Minute(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_Hours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Hours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxTimeSpan result;
@@ -21587,7 +21711,7 @@ static PyObject *_wrap_TimeSpan_Hours(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Hours",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21607,7 +21731,7 @@ static PyObject *_wrap_TimeSpan_Hours(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_TimeSpan_Hour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Hour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan result;
     char *kwnames[] = {
@@ -21633,7 +21757,7 @@ static PyObject *_wrap_TimeSpan_Hour(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TimeSpan_Days(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Days(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxTimeSpan result;
@@ -21643,7 +21767,7 @@ static PyObject *_wrap_TimeSpan_Days(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Days",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21663,7 +21787,7 @@ static PyObject *_wrap_TimeSpan_Days(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TimeSpan_Day(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Day(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan result;
     char *kwnames[] = {
@@ -21689,7 +21813,7 @@ static PyObject *_wrap_TimeSpan_Day(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_TimeSpan_Weeks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Weeks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 ;
     wxTimeSpan result;
@@ -21699,7 +21823,7 @@ static PyObject *_wrap_TimeSpan_Weeks(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Weeks",kwnames,&obj0)) goto fail;
-    arg1 = (long) SWIG_AsLong(obj0); 
+    arg1 = (long)SWIG_As_long(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21719,7 +21843,7 @@ static PyObject *_wrap_TimeSpan_Weeks(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_TimeSpan_Week(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Week(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan result;
     char *kwnames[] = {
@@ -21745,7 +21869,7 @@ static PyObject *_wrap_TimeSpan_Week(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_TimeSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TimeSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long arg1 = (long) 0 ;
     long arg2 = (long) 0 ;
@@ -21762,19 +21886,19 @@ static PyObject *_wrap_new_TimeSpan(PyObject *self, PyObject *args, PyObject *kw
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_TimeSpan",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (long) SWIG_AsLong(obj0); 
+        arg1 = (long)SWIG_As_long(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (long) SWIG_AsLong(obj3); 
+        arg4 = (long)SWIG_As_long(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21791,7 +21915,7 @@ static PyObject *_wrap_new_TimeSpan(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_TimeSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_TimeSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21816,7 +21940,7 @@ static PyObject *_wrap_delete_TimeSpan(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_Add(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -21854,7 +21978,7 @@ static PyObject *_wrap_TimeSpan_Add(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_TimeSpan_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Subtract(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -21892,7 +22016,7 @@ static PyObject *_wrap_TimeSpan_Subtract(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TimeSpan_Multiply(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Multiply(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int arg2 ;
@@ -21906,7 +22030,7 @@ static PyObject *_wrap_TimeSpan_Multiply(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan_Multiply",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21925,7 +22049,7 @@ static PyObject *_wrap_TimeSpan_Multiply(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TimeSpan_Neg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Neg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *result;
@@ -21954,7 +22078,7 @@ static PyObject *_wrap_TimeSpan_Neg(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_TimeSpan_Abs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Abs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan result;
@@ -21984,7 +22108,7 @@ static PyObject *_wrap_TimeSpan_Abs(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_TimeSpan___iadd__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -21997,7 +22121,7 @@ static PyObject *_wrap_TimeSpan___iadd__(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___iadd__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimeSpan,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -22015,14 +22139,14 @@ static PyObject *_wrap_TimeSpan___iadd__(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimeSpan, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimeSpan, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan___isub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -22035,7 +22159,7 @@ static PyObject *_wrap_TimeSpan___isub__(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___isub__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimeSpan,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -22053,14 +22177,14 @@ static PyObject *_wrap_TimeSpan___isub__(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimeSpan, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimeSpan, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan___imul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___imul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int arg2 ;
@@ -22073,8 +22197,8 @@ static PyObject *_wrap_TimeSpan___imul__(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___imul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimeSpan,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22086,14 +22210,14 @@ static PyObject *_wrap_TimeSpan___imul__(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimeSpan, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTimeSpan, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan___neg__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___neg__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *result;
@@ -22122,7 +22246,7 @@ static PyObject *_wrap_TimeSpan___neg__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -22161,7 +22285,7 @@ static PyObject *_wrap_TimeSpan___add__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -22200,7 +22324,7 @@ static PyObject *_wrap_TimeSpan___sub__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___mul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___mul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int arg2 ;
@@ -22214,7 +22338,7 @@ static PyObject *_wrap_TimeSpan___mul__(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___mul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22234,7 +22358,7 @@ static PyObject *_wrap_TimeSpan___mul__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___rmul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___rmul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int arg2 ;
@@ -22248,7 +22372,7 @@ static PyObject *_wrap_TimeSpan___rmul__(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TimeSpan___rmul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTimeSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22268,7 +22392,7 @@ static PyObject *_wrap_TimeSpan___rmul__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___lt__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = (wxTimeSpan *) 0 ;
@@ -22300,7 +22424,7 @@ static PyObject *_wrap_TimeSpan___lt__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___le__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = (wxTimeSpan *) 0 ;
@@ -22332,7 +22456,7 @@ static PyObject *_wrap_TimeSpan___le__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___gt__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = (wxTimeSpan *) 0 ;
@@ -22364,7 +22488,7 @@ static PyObject *_wrap_TimeSpan___gt__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___ge__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = (wxTimeSpan *) 0 ;
@@ -22396,7 +22520,7 @@ static PyObject *_wrap_TimeSpan___ge__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = (wxTimeSpan *) 0 ;
@@ -22428,7 +22552,7 @@ static PyObject *_wrap_TimeSpan___eq__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = (wxTimeSpan *) 0 ;
@@ -22460,7 +22584,7 @@ static PyObject *_wrap_TimeSpan___ne__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_IsNull(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_IsNull(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     bool result;
@@ -22488,7 +22612,7 @@ static PyObject *_wrap_TimeSpan_IsNull(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_TimeSpan_IsPositive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_IsPositive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     bool result;
@@ -22516,7 +22640,7 @@ static PyObject *_wrap_TimeSpan_IsPositive(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TimeSpan_IsNegative(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_IsNegative(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     bool result;
@@ -22544,7 +22668,7 @@ static PyObject *_wrap_TimeSpan_IsNegative(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TimeSpan_IsEqualTo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_IsEqualTo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -22581,7 +22705,7 @@ static PyObject *_wrap_TimeSpan_IsEqualTo(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TimeSpan_IsLongerThan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_IsLongerThan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -22618,7 +22742,7 @@ static PyObject *_wrap_TimeSpan_IsLongerThan(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_TimeSpan_IsShorterThan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_IsShorterThan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxTimeSpan *arg2 = 0 ;
@@ -22655,7 +22779,7 @@ static PyObject *_wrap_TimeSpan_IsShorterThan(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TimeSpan_GetWeeks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_GetWeeks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int result;
@@ -22674,14 +22798,14 @@ static PyObject *_wrap_TimeSpan_GetWeeks(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan_GetDays(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_GetDays(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int result;
@@ -22700,14 +22824,14 @@ static PyObject *_wrap_TimeSpan_GetDays(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan_GetHours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_GetHours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int result;
@@ -22726,14 +22850,14 @@ static PyObject *_wrap_TimeSpan_GetHours(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan_GetMinutes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_GetMinutes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     int result;
@@ -22752,14 +22876,14 @@ static PyObject *_wrap_TimeSpan_GetMinutes(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TimeSpan_GetSeconds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_GetSeconds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxLongLong result;
@@ -22796,7 +22920,7 @@ static PyObject *_wrap_TimeSpan_GetSeconds(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TimeSpan_GetMilliseconds(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_GetMilliseconds(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxLongLong result;
@@ -22833,7 +22957,7 @@ static PyObject *_wrap_TimeSpan_GetMilliseconds(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TimeSpan_Format(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TimeSpan_Format(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTimeSpan *arg1 = (wxTimeSpan *) 0 ;
     wxString const &arg2_defvalue = wxPyTimeSpanFormatStr ;
@@ -22884,14 +23008,14 @@ static PyObject *_wrap_TimeSpan_Format(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * TimeSpan_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TimeSpan_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTimeSpan, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DateSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DateSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -22908,19 +23032,19 @@ static PyObject *_wrap_new_DateSpan(PyObject *self, PyObject *args, PyObject *kw
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DateSpan",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -22937,7 +23061,7 @@ static PyObject *_wrap_new_DateSpan(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_DateSpan(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DateSpan(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22962,7 +23086,7 @@ static PyObject *_wrap_delete_DateSpan(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan_Days(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Days(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxDateSpan result;
@@ -22972,7 +23096,7 @@ static PyObject *_wrap_DateSpan_Days(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Days",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22992,7 +23116,7 @@ static PyObject *_wrap_DateSpan_Days(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DateSpan_Day(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Day(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan result;
     char *kwnames[] = {
@@ -23018,7 +23142,7 @@ static PyObject *_wrap_DateSpan_Day(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DateSpan_Weeks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Weeks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxDateSpan result;
@@ -23028,7 +23152,7 @@ static PyObject *_wrap_DateSpan_Weeks(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Weeks",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23048,7 +23172,7 @@ static PyObject *_wrap_DateSpan_Weeks(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DateSpan_Week(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Week(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan result;
     char *kwnames[] = {
@@ -23074,7 +23198,7 @@ static PyObject *_wrap_DateSpan_Week(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DateSpan_Months(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Months(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxDateSpan result;
@@ -23084,7 +23208,7 @@ static PyObject *_wrap_DateSpan_Months(PyObject *self, PyObject *args, PyObject
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Months",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23104,7 +23228,7 @@ static PyObject *_wrap_DateSpan_Months(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan_Month(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Month(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan result;
     char *kwnames[] = {
@@ -23130,7 +23254,7 @@ static PyObject *_wrap_DateSpan_Month(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DateSpan_Years(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Years(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxDateSpan result;
@@ -23140,7 +23264,7 @@ static PyObject *_wrap_DateSpan_Years(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:DateSpan_Years",kwnames,&obj0)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23160,7 +23284,7 @@ static PyObject *_wrap_DateSpan_Years(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DateSpan_Year(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Year(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan result;
     char *kwnames[] = {
@@ -23186,7 +23310,7 @@ static PyObject *_wrap_DateSpan_Year(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DateSpan_SetYears(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_SetYears(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23200,7 +23324,7 @@ static PyObject *_wrap_DateSpan_SetYears(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetYears",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23219,7 +23343,7 @@ static PyObject *_wrap_DateSpan_SetYears(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateSpan_SetMonths(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_SetMonths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23233,7 +23357,7 @@ static PyObject *_wrap_DateSpan_SetMonths(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetMonths",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23252,7 +23376,7 @@ static PyObject *_wrap_DateSpan_SetMonths(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DateSpan_SetWeeks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_SetWeeks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23266,7 +23390,7 @@ static PyObject *_wrap_DateSpan_SetWeeks(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetWeeks",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23285,7 +23409,7 @@ static PyObject *_wrap_DateSpan_SetWeeks(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateSpan_SetDays(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_SetDays(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23299,7 +23423,7 @@ static PyObject *_wrap_DateSpan_SetDays(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_SetDays",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23318,7 +23442,7 @@ static PyObject *_wrap_DateSpan_SetDays(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan_GetYears(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_GetYears(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int result;
@@ -23337,14 +23461,14 @@ static PyObject *_wrap_DateSpan_GetYears(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan_GetMonths(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_GetMonths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int result;
@@ -23363,14 +23487,14 @@ static PyObject *_wrap_DateSpan_GetMonths(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan_GetWeeks(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_GetWeeks(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int result;
@@ -23389,14 +23513,14 @@ static PyObject *_wrap_DateSpan_GetWeeks(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan_GetDays(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_GetDays(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int result;
@@ -23415,14 +23539,14 @@ static PyObject *_wrap_DateSpan_GetDays(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan_GetTotalDays(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_GetTotalDays(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int result;
@@ -23441,14 +23565,14 @@ static PyObject *_wrap_DateSpan_GetTotalDays(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan_Add(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -23486,7 +23610,7 @@ static PyObject *_wrap_DateSpan_Add(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DateSpan_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Subtract(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -23524,7 +23648,7 @@ static PyObject *_wrap_DateSpan_Subtract(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateSpan_Neg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Neg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *result;
@@ -23553,7 +23677,7 @@ static PyObject *_wrap_DateSpan_Neg(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_DateSpan_Multiply(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan_Multiply(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23567,7 +23691,7 @@ static PyObject *_wrap_DateSpan_Multiply(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan_Multiply",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23586,7 +23710,7 @@ static PyObject *_wrap_DateSpan_Multiply(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateSpan___iadd__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___iadd__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -23599,7 +23723,7 @@ static PyObject *_wrap_DateSpan___iadd__(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___iadd__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -23617,14 +23741,14 @@ static PyObject *_wrap_DateSpan___iadd__(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateSpan, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateSpan, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan___isub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___isub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -23637,7 +23761,7 @@ static PyObject *_wrap_DateSpan___isub__(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___isub__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
     SWIG_fail;
@@ -23655,14 +23779,14 @@ static PyObject *_wrap_DateSpan___isub__(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateSpan, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateSpan, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan___neg__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___neg__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *result;
@@ -23691,7 +23815,7 @@ static PyObject *_wrap_DateSpan___neg__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan___imul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___imul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23704,8 +23828,8 @@ static PyObject *_wrap_DateSpan___imul__(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___imul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
-    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23717,14 +23841,14 @@ static PyObject *_wrap_DateSpan___imul__(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateSpan, 0);
+    resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDateSpan, 1);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DateSpan___add__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___add__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -23763,7 +23887,7 @@ static PyObject *_wrap_DateSpan___add__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan___sub__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___sub__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = 0 ;
@@ -23802,7 +23926,7 @@ static PyObject *_wrap_DateSpan___sub__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan___mul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___mul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23816,7 +23940,7 @@ static PyObject *_wrap_DateSpan___mul__(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___mul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23836,7 +23960,7 @@ static PyObject *_wrap_DateSpan___mul__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan___rmul__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___rmul__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     int arg2 ;
@@ -23850,7 +23974,7 @@ static PyObject *_wrap_DateSpan___rmul__(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DateSpan___rmul__",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDateSpan,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23870,7 +23994,7 @@ static PyObject *_wrap_DateSpan___rmul__(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = (wxDateSpan *) 0 ;
@@ -23902,7 +24026,7 @@ static PyObject *_wrap_DateSpan___eq__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DateSpan___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDateSpan *arg1 = (wxDateSpan *) 0 ;
     wxDateSpan *arg2 = (wxDateSpan *) 0 ;
@@ -23934,14 +24058,14 @@ static PyObject *_wrap_DateSpan___ne__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * DateSpan_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DateSpan_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDateSpan, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_GetLocalTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetLocalTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -23956,14 +24080,14 @@ static PyObject *_wrap_GetLocalTime(PyObject *self, PyObject *args, PyObject *kw
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetUTCTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetUTCTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -23978,14 +24102,14 @@ static PyObject *_wrap_GetUTCTime(PyObject *self, PyObject *args, PyObject *kwar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetCurrentTime(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetCurrentTime(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     long result;
     char *kwnames[] = {
@@ -24000,14 +24124,14 @@ static PyObject *_wrap_GetCurrentTime(PyObject *self, PyObject *args, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GetLocalTimeMillis(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GetLocalTimeMillis(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLongLong result;
     char *kwnames[] = {
@@ -24040,7 +24164,7 @@ static PyObject *_wrap_GetLocalTimeMillis(PyObject *self, PyObject *args, PyObje
 }
 
 
-static int _wrap_DefaultDateTime_set(PyObject *_val) {
+static int _wrap_DefaultDateTime_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DefaultDateTime is read-only.");
     return 1;
 }
@@ -24054,7 +24178,7 @@ static PyObject *_wrap_DefaultDateTime_get() {
 }
 
 
-static PyObject *_wrap_new_DataFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DataFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxDataFormat *result;
@@ -24064,7 +24188,7 @@ static PyObject *_wrap_new_DataFormat(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_DataFormat",kwnames,&obj0)) goto fail;
-    arg1 = (wxDataFormatId) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24080,7 +24204,7 @@ static PyObject *_wrap_new_DataFormat(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_CustomDataFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CustomDataFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxDataFormat *result;
@@ -24118,7 +24242,7 @@ static PyObject *_wrap_new_CustomDataFormat(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_DataFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DataFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24143,7 +24267,7 @@ static PyObject *_wrap_delete_DataFormat(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     int arg2 ;
@@ -24154,7 +24278,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args)
     if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___eq__",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDataFormat,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDataFormatId) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24172,7 +24296,7 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     int arg2 ;
@@ -24183,7 +24307,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args)
     if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDataFormat,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDataFormatId) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24201,7 +24325,7 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_DataFormat___eq____SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DataFormat___eq____SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24282,7 +24406,7 @@ static PyObject *_wrap_DataFormat___eq__(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
-            _v = SWIG_CheckInt(argv[1]);
+            _v = SWIG_Check_int(argv[1]);
             if (_v) {
                 return _wrap_DataFormat___eq____SWIG_0(self,args);
             }
@@ -24294,7 +24418,7 @@ static PyObject *_wrap_DataFormat___eq__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DataFormat___ne____SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_DataFormat___ne____SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24375,7 +24499,7 @@ static PyObject *_wrap_DataFormat___ne__(PyObject *self, PyObject *args) {
             }
         }
         if (_v) {
-            _v = SWIG_CheckInt(argv[1]);
+            _v = SWIG_Check_int(argv[1]);
             if (_v) {
                 return _wrap_DataFormat___ne____SWIG_0(self,args);
             }
@@ -24387,7 +24511,7 @@ static PyObject *_wrap_DataFormat___ne__(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_DataFormat_SetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataFormat_SetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     int arg2 ;
@@ -24400,7 +24524,7 @@ static PyObject *_wrap_DataFormat_SetType(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DataFormat_SetType",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDataFormat,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDataFormatId) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24416,7 +24540,7 @@ static PyObject *_wrap_DataFormat_SetType(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DataFormat_GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataFormat_GetType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     int result;
@@ -24435,14 +24559,14 @@ static PyObject *_wrap_DataFormat_GetType(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DataFormat_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataFormat_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     wxString result;
@@ -24474,7 +24598,7 @@ static PyObject *_wrap_DataFormat_GetId(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_DataFormat_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataFormat_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat *arg1 = (wxDataFormat *) 0 ;
     wxString *arg2 = 0 ;
@@ -24515,14 +24639,14 @@ static PyObject *_wrap_DataFormat_SetId(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * DataFormat_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DataFormat_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDataFormat, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_FormatInvalid_set(PyObject *_val) {
+static int _wrap_FormatInvalid_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FormatInvalid is read-only.");
     return 1;
 }
@@ -24536,7 +24660,7 @@ static PyObject *_wrap_FormatInvalid_get() {
 }
 
 
-static PyObject *_wrap_delete_DataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24561,7 +24685,7 @@ static PyObject *_wrap_delete_DataObject(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DataObject_GetPreferredFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_GetPreferredFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     int arg2 = (int) wxDataObject::Get ;
@@ -24576,7 +24700,7 @@ static PyObject *_wrap_DataObject_GetPreferredFormat(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDataObject,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDataObject::Direction) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24597,7 +24721,7 @@ static PyObject *_wrap_DataObject_GetPreferredFormat(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_GetFormatCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     int arg2 = (int) wxDataObject::Get ;
@@ -24612,7 +24736,7 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDataObject,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDataObject::Direction) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24622,14 +24746,14 @@ static PyObject *_wrap_DataObject_GetFormatCount(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_IsSupported(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24653,7 +24777,7 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py
         SWIG_fail;
     }
     if (obj2) {
-        arg3 = (wxDataObject::Direction) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24672,7 +24796,7 @@ static PyObject *_wrap_DataObject_IsSupported(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DataObject_GetDataSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_GetDataSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24700,14 +24824,14 @@ static PyObject *_wrap_DataObject_GetDataSize(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DataObject_GetAllFormats(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_GetAllFormats(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     int arg2 = (int) wxDataObject::Get ;
@@ -24722,7 +24846,7 @@ static PyObject *_wrap_DataObject_GetAllFormats(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDataObject,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (wxDataObject::Direction) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -24739,7 +24863,7 @@ static PyObject *_wrap_DataObject_GetAllFormats(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DataObject_GetDataHere(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_GetDataHere(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24774,7 +24898,7 @@ static PyObject *_wrap_DataObject_GetDataHere(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObject_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24814,14 +24938,14 @@ static PyObject *_wrap_DataObject_SetData(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * DataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DataObjectSimple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DataObjectSimple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat const &arg1_defvalue = wxFormatInvalid ;
     wxDataFormat *arg1 = (wxDataFormat *) &arg1_defvalue ;
@@ -24855,7 +24979,7 @@ static PyObject *_wrap_new_DataObjectSimple(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DataObjectSimple_GetFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObjectSimple_GetFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectSimple *arg1 = (wxDataObjectSimple *) 0 ;
     wxDataFormat *result;
@@ -24884,7 +25008,7 @@ static PyObject *_wrap_DataObjectSimple_GetFormat(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DataObjectSimple_SetFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObjectSimple_SetFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectSimple *arg1 = (wxDataObjectSimple *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -24918,7 +25042,7 @@ static PyObject *_wrap_DataObjectSimple_SetFormat(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_DataObjectSimple_GetDataSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObjectSimple_GetDataSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectSimple *arg1 = (wxDataObjectSimple *) 0 ;
     size_t result;
@@ -24937,14 +25061,14 @@ static PyObject *_wrap_DataObjectSimple_GetDataSize(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DataObjectSimple_GetDataHere(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObjectSimple_GetDataHere(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectSimple *arg1 = (wxDataObjectSimple *) 0 ;
     PyObject *result;
@@ -24970,7 +25094,7 @@ static PyObject *_wrap_DataObjectSimple_GetDataHere(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_DataObjectSimple_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObjectSimple_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectSimple *arg1 = (wxDataObjectSimple *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25001,14 +25125,14 @@ static PyObject *_wrap_DataObjectSimple_SetData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * DataObjectSimple_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DataObjectSimple_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDataObjectSimple, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyDataObjectSimple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyDataObjectSimple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat const &arg1_defvalue = wxFormatInvalid ;
     wxDataFormat *arg1 = (wxDataFormat *) &arg1_defvalue ;
@@ -25042,7 +25166,7 @@ static PyObject *_wrap_new_PyDataObjectSimple(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyDataObjectSimple__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyDataObjectSimple__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDataObjectSimple *arg1 = (wxPyDataObjectSimple *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25073,14 +25197,14 @@ static PyObject *_wrap_PyDataObjectSimple__setCallbackInfo(PyObject *self, PyObj
 }
 
 
-static PyObject * PyDataObjectSimple_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyDataObjectSimple_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDataObjectSimple, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DataObjectComposite(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DataObjectComposite(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectComposite *result;
     char *kwnames[] = {
@@ -25102,7 +25226,7 @@ static PyObject *_wrap_new_DataObjectComposite(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DataObjectComposite_Add(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObjectComposite *arg1 = (wxDataObjectComposite *) 0 ;
     wxDataObjectSimple *arg2 = (wxDataObjectSimple *) 0 ;
@@ -25120,7 +25244,7 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDataObjectSimple,
     SWIG_POINTER_EXCEPTION | SWIG_POINTER_DISOWN)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -25137,14 +25261,14 @@ static PyObject *_wrap_DataObjectComposite_Add(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * DataObjectComposite_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DataObjectComposite_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDataObjectComposite, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TextDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TextDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -25185,7 +25309,7 @@ static PyObject *_wrap_new_TextDataObject(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextDataObject_GetTextLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDataObject_GetTextLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextDataObject *arg1 = (wxTextDataObject *) 0 ;
     size_t result;
@@ -25204,14 +25328,14 @@ static PyObject *_wrap_TextDataObject_GetTextLength(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextDataObject_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDataObject_GetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextDataObject *arg1 = (wxTextDataObject *) 0 ;
     wxString result;
@@ -25243,7 +25367,7 @@ static PyObject *_wrap_TextDataObject_GetText(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TextDataObject_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDataObject_SetText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextDataObject *arg1 = (wxTextDataObject *) 0 ;
     wxString *arg2 = 0 ;
@@ -25284,14 +25408,14 @@ static PyObject *_wrap_TextDataObject_SetText(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * TextDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TextDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTextDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyTextDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyTextDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -25332,7 +25456,7 @@ static PyObject *_wrap_new_PyTextDataObject(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyTextDataObject__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyTextDataObject__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDataObject *arg1 = (wxPyTextDataObject *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25363,14 +25487,14 @@ static PyObject *_wrap_PyTextDataObject__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject * PyTextDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyTextDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTextDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_BitmapDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_BitmapDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap const &arg1_defvalue = wxNullBitmap ;
     wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
@@ -25404,7 +25528,7 @@ static PyObject *_wrap_new_BitmapDataObject(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_BitmapDataObject_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapDataObject_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapDataObject *arg1 = (wxBitmapDataObject *) 0 ;
     wxBitmap result;
@@ -25434,7 +25558,7 @@ static PyObject *_wrap_BitmapDataObject_GetBitmap(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_BitmapDataObject_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_BitmapDataObject_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmapDataObject *arg1 = (wxBitmapDataObject *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -25468,14 +25592,14 @@ static PyObject *_wrap_BitmapDataObject_SetBitmap(PyObject *self, PyObject *args
 }
 
 
-static PyObject * BitmapDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * BitmapDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxBitmapDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyBitmapDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyBitmapDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap const &arg1_defvalue = wxNullBitmap ;
     wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ;
@@ -25509,7 +25633,7 @@ static PyObject *_wrap_new_PyBitmapDataObject(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyBitmapDataObject__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyBitmapDataObject__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyBitmapDataObject *arg1 = (wxPyBitmapDataObject *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25540,14 +25664,14 @@ static PyObject *_wrap_PyBitmapDataObject__setCallbackInfo(PyObject *self, PyObj
 }
 
 
-static PyObject * PyBitmapDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyBitmapDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyBitmapDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDataObject *result;
     char *kwnames[] = {
@@ -25569,7 +25693,7 @@ static PyObject *_wrap_new_FileDataObject(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FileDataObject_GetFilenames(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDataObject_GetFilenames(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDataObject *arg1 = (wxFileDataObject *) 0 ;
     wxArrayString *result;
@@ -25600,7 +25724,7 @@ static PyObject *_wrap_FileDataObject_GetFilenames(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FileDataObject_AddFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDataObject_AddFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDataObject *arg1 = (wxFileDataObject *) 0 ;
     wxString *arg2 = 0 ;
@@ -25641,14 +25765,14 @@ static PyObject *_wrap_FileDataObject_AddFile(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * FileDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CustomDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CustomDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataFormat const &arg1_defvalue = wxFormatInvalid ;
     wxDataFormat *arg1 = (wxDataFormat *) &arg1_defvalue ;
@@ -25682,7 +25806,7 @@ static PyObject *_wrap_new_CustomDataObject(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CustomDataObject_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CustomDataObject_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCustomDataObject *arg1 = (wxCustomDataObject *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -25713,7 +25837,7 @@ static PyObject *_wrap_CustomDataObject_SetData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CustomDataObject_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CustomDataObject_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCustomDataObject *arg1 = (wxCustomDataObject *) 0 ;
     size_t result;
@@ -25732,14 +25856,14 @@ static PyObject *_wrap_CustomDataObject_GetSize(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CustomDataObject_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CustomDataObject_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCustomDataObject *arg1 = (wxCustomDataObject *) 0 ;
     PyObject *result;
@@ -25765,14 +25889,14 @@ static PyObject *_wrap_CustomDataObject_GetData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * CustomDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CustomDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCustomDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_URLDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_URLDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxURLDataObject *result;
     char *kwnames[] = {
@@ -25794,7 +25918,7 @@ static PyObject *_wrap_new_URLDataObject(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_URLDataObject_GetURL(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_URLDataObject_GetURL(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxURLDataObject *arg1 = (wxURLDataObject *) 0 ;
     wxString result;
@@ -25826,7 +25950,7 @@ static PyObject *_wrap_URLDataObject_GetURL(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_URLDataObject_SetURL(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_URLDataObject_SetURL(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxURLDataObject *arg1 = (wxURLDataObject *) 0 ;
     wxString *arg2 = 0 ;
@@ -25867,14 +25991,14 @@ static PyObject *_wrap_URLDataObject_SetURL(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * URLDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * URLDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxURLDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MetafileDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MetafileDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetafileDataObject *result;
     char *kwnames[] = {
@@ -25896,7 +26020,7 @@ static PyObject *_wrap_new_MetafileDataObject(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MetafileDataObject_SetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetafileDataObject_SetMetafile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ;
     wxMetafile *arg2 = 0 ;
@@ -25930,7 +26054,7 @@ static PyObject *_wrap_MetafileDataObject_SetMetafile(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_MetafileDataObject_GetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MetafileDataObject_GetMetafile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ;
     wxMetafile result;
@@ -25960,14 +26084,14 @@ static PyObject *_wrap_MetafileDataObject_GetMetafile(PyObject *self, PyObject *
 }
 
 
-static PyObject * MetafileDataObject_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MetafileDataObject_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMetafileDataObject, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_IsDragResultOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     bool result;
@@ -25977,7 +26101,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject *
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:IsDragResultOk",kwnames,&obj0)) goto fail;
-    arg1 = (wxDragResult) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -25995,7 +26119,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DropSource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxCursor const &arg2_defvalue = wxNullCursor ;
@@ -26057,7 +26181,7 @@ static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DropSource__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropSource__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -26076,7 +26200,7 @@ static PyObject *_wrap_DropSource__setCallbackInfo(PyObject *self, PyObject *arg
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     arg2 = obj1;
     arg3 = obj2;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26092,7 +26216,7 @@ static PyObject *_wrap_DropSource__setCallbackInfo(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_delete_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DropSource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26117,7 +26241,7 @@ static PyObject *_wrap_delete_DropSource(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DropSource_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropSource_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     wxDataObject *arg2 = 0 ;
@@ -26151,7 +26275,7 @@ static PyObject *_wrap_DropSource_SetData(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_DropSource_GetDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropSource_GetDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     wxDataObject *result;
@@ -26177,7 +26301,7 @@ static PyObject *_wrap_DropSource_GetDataObject(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DropSource_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropSource_SetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     int arg2 ;
@@ -26192,7 +26316,7 @@ static PyObject *_wrap_DropSource_SetCursor(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropSource_SetCursor",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDropSource,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDragResult) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxCursor,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -26215,7 +26339,7 @@ static PyObject *_wrap_DropSource_SetCursor(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropSource_DoDragDrop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     int arg2 = (int) wxDrag_CopyOnly ;
@@ -26230,7 +26354,7 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDropSource,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -26240,14 +26364,14 @@ static PyObject *_wrap_DropSource_DoDragDrop(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
     int arg2 ;
@@ -26261,7 +26385,7 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DropSource_base_GiveFeedback",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDropSource,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDragResult) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26279,14 +26403,14 @@ static PyObject *_wrap_DropSource_base_GiveFeedback(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * DropSource_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DropSource_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDropSource, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDataObject *arg1 = (wxDataObject *) NULL ;
     wxPyDropTarget *result;
@@ -26314,7 +26438,7 @@ static PyObject *_wrap_new_DropTarget(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_DropTarget__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -26345,7 +26469,7 @@ static PyObject *_wrap_DropTarget__setCallbackInfo(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_delete_DropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_DropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26370,7 +26494,7 @@ static PyObject *_wrap_delete_DropTarget(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DropTarget_GetDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_GetDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     wxDataObject *result;
@@ -26396,7 +26520,7 @@ static PyObject *_wrap_DropTarget_GetDataObject(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_SetDataObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     wxDataObject *arg2 = (wxDataObject *) 0 ;
@@ -26425,7 +26549,7 @@ static PyObject *_wrap_DropTarget_SetDataObject(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     int arg2 ;
@@ -26443,11 +26567,11 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26456,14 +26580,14 @@ static PyObject *_wrap_DropTarget_base_OnEnter(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     int arg2 ;
@@ -26481,11 +26605,11 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26494,14 +26618,14 @@ static PyObject *_wrap_DropTarget_base_OnDragOver(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26526,7 +26650,7 @@ static PyObject *_wrap_DropTarget_base_OnLeave(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     int arg2 ;
@@ -26542,9 +26666,9 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26562,7 +26686,7 @@ static PyObject *_wrap_DropTarget_base_OnDrop(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_DropTarget_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DropTarget_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyDropTarget *arg1 = (wxPyDropTarget *) 0 ;
     bool result;
@@ -26590,14 +26714,14 @@ static PyObject *_wrap_DropTarget_GetData(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * DropTarget_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DropTarget_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyDropTarget, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TextDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TextDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *result;
     char *kwnames[] = {
@@ -26619,7 +26743,7 @@ static PyObject *_wrap_new_TextDropTarget(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TextDropTarget__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDropTarget__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -26650,7 +26774,7 @@ static PyObject *_wrap_TextDropTarget__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
     int arg2 ;
@@ -26668,11 +26792,11 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26681,14 +26805,14 @@ static PyObject *_wrap_TextDropTarget_base_OnEnter(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
     int arg2 ;
@@ -26706,11 +26830,11 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26719,14 +26843,14 @@ static PyObject *_wrap_TextDropTarget_base_OnDragOver(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26751,7 +26875,7 @@ static PyObject *_wrap_TextDropTarget_base_OnLeave(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
     int arg2 ;
@@ -26767,9 +26891,9 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26787,7 +26911,7 @@ static PyObject *_wrap_TextDropTarget_base_OnDrop(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyTextDropTarget *arg1 = (wxPyTextDropTarget *) 0 ;
     int arg2 ;
@@ -26805,11 +26929,11 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTextDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26818,21 +26942,21 @@ static PyObject *_wrap_TextDropTarget_base_OnData(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * TextDropTarget_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TextDropTarget_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyTextDropTarget, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileDropTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileDropTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *result;
     char *kwnames[] = {
@@ -26854,7 +26978,7 @@ static PyObject *_wrap_new_FileDropTarget(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FileDropTarget__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDropTarget__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -26885,7 +27009,7 @@ static PyObject *_wrap_FileDropTarget__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
     int arg2 ;
@@ -26903,11 +27027,11 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26916,14 +27040,14 @@ static PyObject *_wrap_FileDropTarget_base_OnEnter(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
     int arg2 ;
@@ -26941,11 +27065,11 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -26954,14 +27078,14 @@ static PyObject *_wrap_FileDropTarget_base_OnDragOver(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
     PyObject * obj0 = 0 ;
@@ -26986,7 +27110,7 @@ static PyObject *_wrap_FileDropTarget_base_OnLeave(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
     int arg2 ;
@@ -27002,9 +27126,9 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FileDropTarget_base_OnDrop",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27022,7 +27146,7 @@ static PyObject *_wrap_FileDropTarget_base_OnDrop(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyFileDropTarget *arg1 = (wxPyFileDropTarget *) 0 ;
     int arg2 ;
@@ -27040,11 +27164,11 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_base_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyFileDropTarget,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxDragResult) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -27053,21 +27177,21 @@ static PyObject *_wrap_FileDropTarget_base_OnData(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * FileDropTarget_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileDropTarget_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyFileDropTarget, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Clipboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Clipboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *result;
     char *kwnames[] = {
@@ -27089,7 +27213,7 @@ static PyObject *_wrap_new_Clipboard(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_Clipboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Clipboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27114,7 +27238,7 @@ static PyObject *_wrap_delete_Clipboard(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Clipboard_Open(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_Open(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     bool result;
@@ -27142,7 +27266,7 @@ static PyObject *_wrap_Clipboard_Open(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Clipboard_Close(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_Close(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27167,7 +27291,7 @@ static PyObject *_wrap_Clipboard_Close(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Clipboard_IsOpened(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_IsOpened(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     bool result;
@@ -27195,7 +27319,7 @@ static PyObject *_wrap_Clipboard_IsOpened(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_AddData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     wxDataObject *arg2 = (wxDataObject *) 0 ;
@@ -27227,7 +27351,7 @@ static PyObject *_wrap_Clipboard_AddData(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     wxDataObject *arg2 = (wxDataObject *) 0 ;
@@ -27259,7 +27383,7 @@ static PyObject *_wrap_Clipboard_SetData(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Clipboard_IsSupported(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_IsSupported(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     wxDataFormat *arg2 = 0 ;
@@ -27296,7 +27420,7 @@ static PyObject *_wrap_Clipboard_IsSupported(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Clipboard_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     wxDataObject *arg2 = 0 ;
@@ -27333,7 +27457,7 @@ static PyObject *_wrap_Clipboard_GetData(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Clipboard_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27358,7 +27482,7 @@ static PyObject *_wrap_Clipboard_Clear(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_Flush(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     bool result;
@@ -27386,7 +27510,7 @@ static PyObject *_wrap_Clipboard_Flush(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) 0 ;
     bool arg2 = (bool) True ;
@@ -27400,7 +27524,7 @@ static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxClipboard,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27417,7 +27541,7 @@ static PyObject *_wrap_Clipboard_UsePrimarySelection(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Clipboard_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Clipboard_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *result;
     char *kwnames[] = {
@@ -27439,14 +27563,14 @@ static PyObject *_wrap_Clipboard_Get(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject * Clipboard_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Clipboard_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxClipboard, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ClipboardLocker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ClipboardLocker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboard *arg1 = (wxClipboard *) NULL ;
     wxClipboardLocker *result;
@@ -27474,7 +27598,7 @@ static PyObject *_wrap_new_ClipboardLocker(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_delete_ClipboardLocker(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ClipboardLocker(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboardLocker *arg1 = (wxClipboardLocker *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27499,7 +27623,7 @@ static PyObject *_wrap_delete_ClipboardLocker(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxClipboardLocker *arg1 = (wxClipboardLocker *) 0 ;
     bool result;
@@ -27527,14 +27651,14 @@ static PyObject *_wrap_ClipboardLocker___nonzero__(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * ClipboardLocker_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ClipboardLocker_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxClipboardLocker, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_VideoMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_VideoMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -27551,19 +27675,19 @@ static PyObject *_wrap_new_VideoMode(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_VideoMode",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -27580,7 +27704,7 @@ static PyObject *_wrap_new_VideoMode(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_delete_VideoMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_VideoMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     PyObject * obj0 = 0 ;
@@ -27605,7 +27729,7 @@ static PyObject *_wrap_delete_VideoMode(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VideoMode_Matches(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_Matches(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     wxVideoMode *arg2 = 0 ;
@@ -27642,7 +27766,7 @@ static PyObject *_wrap_VideoMode_Matches(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_VideoMode_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27661,14 +27785,14 @@ static PyObject *_wrap_VideoMode_GetWidth(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VideoMode_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27687,14 +27811,14 @@ static PyObject *_wrap_VideoMode_GetHeight(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VideoMode_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_GetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27713,14 +27837,14 @@ static PyObject *_wrap_VideoMode_GetDepth(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VideoMode_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     bool result;
@@ -27748,7 +27872,7 @@ static PyObject *_wrap_VideoMode_IsOk(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_VideoMode___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     wxVideoMode *arg2 = (wxVideoMode *) 0 ;
@@ -27780,7 +27904,7 @@ static PyObject *_wrap_VideoMode___eq__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VideoMode___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     wxVideoMode *arg2 = (wxVideoMode *) 0 ;
@@ -27812,7 +27936,7 @@ static PyObject *_wrap_VideoMode___ne__(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VideoMode_w_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_w_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int arg2 ;
@@ -27825,7 +27949,7 @@ static PyObject *_wrap_VideoMode_w_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VideoMode_w_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVideoMode,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->w = arg2;
     
@@ -27836,7 +27960,7 @@ static PyObject *_wrap_VideoMode_w_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VideoMode_w_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_w_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27850,14 +27974,14 @@ static PyObject *_wrap_VideoMode_w_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->w);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VideoMode_h_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_h_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int arg2 ;
@@ -27870,7 +27994,7 @@ static PyObject *_wrap_VideoMode_h_set(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VideoMode_h_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVideoMode,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->h = arg2;
     
@@ -27881,7 +28005,7 @@ static PyObject *_wrap_VideoMode_h_set(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VideoMode_h_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_h_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27895,14 +28019,14 @@ static PyObject *_wrap_VideoMode_h_get(PyObject *self, PyObject *args, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->h);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VideoMode_bpp_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_bpp_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int arg2 ;
@@ -27915,7 +28039,7 @@ static PyObject *_wrap_VideoMode_bpp_set(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VideoMode_bpp_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVideoMode,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->bpp = arg2;
     
@@ -27926,7 +28050,7 @@ static PyObject *_wrap_VideoMode_bpp_set(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_VideoMode_bpp_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_bpp_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27940,14 +28064,14 @@ static PyObject *_wrap_VideoMode_bpp_get(PyObject *self, PyObject *args, PyObjec
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->bpp);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VideoMode_refresh_set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_refresh_set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int arg2 ;
@@ -27960,7 +28084,7 @@ static PyObject *_wrap_VideoMode_refresh_set(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VideoMode_refresh_set",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxVideoMode,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (arg1) (arg1)->refresh = arg2;
     
@@ -27971,7 +28095,7 @@ static PyObject *_wrap_VideoMode_refresh_set(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_VideoMode_refresh_get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VideoMode_refresh_get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxVideoMode *arg1 = (wxVideoMode *) 0 ;
     int result;
@@ -27985,21 +28109,21 @@ static PyObject *_wrap_VideoMode_refresh_get(PyObject *self, PyObject *args, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     result = (int) ((arg1)->refresh);
     
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * VideoMode_swigregister(PyObject *self, PyObject *args) {
+static PyObject * VideoMode_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxVideoMode, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_DefaultVideoMode_set(PyObject *_val) {
+static int _wrap_DefaultVideoMode_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DefaultVideoMode is read-only.");
     return 1;
 }
@@ -28013,7 +28137,7 @@ static PyObject *_wrap_DefaultVideoMode_get() {
 }
 
 
-static PyObject *_wrap_new_Display(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Display(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     size_t arg1 = (size_t) 0 ;
     wxDisplay *result;
@@ -28024,7 +28148,7 @@ static PyObject *_wrap_new_Display(PyObject *self, PyObject *args, PyObject *kwa
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_Display",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (size_t) SWIG_AsUnsignedLong(obj0); 
+        arg1 = (size_t)SWIG_As_unsigned_SS_long(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -28041,7 +28165,7 @@ static PyObject *_wrap_new_Display(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_Display(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Display(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28066,7 +28190,7 @@ static PyObject *_wrap_delete_Display(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Display_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     size_t result;
     char *kwnames[] = {
@@ -28081,14 +28205,14 @@ static PyObject *_wrap_Display_GetCount(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Display_GetFromPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetFromPoint(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPoint *arg1 = 0 ;
     int result;
@@ -28110,14 +28234,14 @@ static PyObject *_wrap_Display_GetFromPoint(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Display_GetFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int result;
@@ -28136,14 +28260,14 @@ static PyObject *_wrap_Display_GetFromWindow(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Display_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_IsOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     bool result;
@@ -28171,7 +28295,7 @@ static PyObject *_wrap_Display_IsOk(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Display_GetGeometry(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetGeometry(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     wxRect result;
@@ -28201,7 +28325,7 @@ static PyObject *_wrap_Display_GetGeometry(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Display_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     wxString result;
@@ -28233,7 +28357,7 @@ static PyObject *_wrap_Display_GetName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Display_IsPrimary(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_IsPrimary(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     bool result;
@@ -28261,7 +28385,7 @@ static PyObject *_wrap_Display_IsPrimary(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Display_GetModes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetModes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     wxVideoMode const &arg2_defvalue = wxDefaultVideoMode ;
@@ -28299,7 +28423,7 @@ static PyObject *_wrap_Display_GetModes(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Display_GetCurrentMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_GetCurrentMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     wxVideoMode result;
@@ -28329,7 +28453,7 @@ static PyObject *_wrap_Display_GetCurrentMode(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Display_ChangeMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_ChangeMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     wxVideoMode const &arg2_defvalue = wxDefaultVideoMode ;
@@ -28369,7 +28493,7 @@ static PyObject *_wrap_Display_ChangeMode(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Display_ResetMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Display_ResetMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDisplay *arg1 = (wxDisplay *) 0 ;
     PyObject * obj0 = 0 ;
@@ -28394,7 +28518,7 @@ static PyObject *_wrap_Display_ResetMode(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * Display_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Display_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDisplay, obj);
@@ -28402,806 +28526,806 @@ static PyObject * Display_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"SystemSettings_GetColour", (PyCFunction) _wrap_SystemSettings_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemSettings_GetFont", (PyCFunction) _wrap_SystemSettings_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemSettings_GetMetric", (PyCFunction) _wrap_SystemSettings_GetMetric, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemSettings_HasFeature", (PyCFunction) _wrap_SystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemSettings_GetScreenType", (PyCFunction) _wrap_SystemSettings_GetScreenType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemSettings_SetScreenType", (PyCFunction) _wrap_SystemSettings_SetScreenType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemSettings_swigregister", SystemSettings_swigregister, METH_VARARGS },
-        { (char *)"new_SystemOptions", (PyCFunction) _wrap_new_SystemOptions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemOptions_SetOption", (PyCFunction) _wrap_SystemOptions_SetOption, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemOptions_SetOptionInt", (PyCFunction) _wrap_SystemOptions_SetOptionInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemOptions_GetOption", (PyCFunction) _wrap_SystemOptions_GetOption, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemOptions_GetOptionInt", (PyCFunction) _wrap_SystemOptions_GetOptionInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemOptions_HasOption", (PyCFunction) _wrap_SystemOptions_HasOption, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SystemOptions_swigregister", SystemOptions_swigregister, METH_VARARGS },
-        { (char *)"NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"RegisterId", (PyCFunction) _wrap_RegisterId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetCurrentId", (PyCFunction) _wrap_GetCurrentId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IsStockID", (PyCFunction) _wrap_IsStockID, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IsStockLabel", (PyCFunction) _wrap_IsStockLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetStockLabel", (PyCFunction) _wrap_GetStockLabel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Bell", (PyCFunction) _wrap_Bell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EndBusyCursor", (PyCFunction) _wrap_EndBusyCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetElapsedTime", (PyCFunction) _wrap_GetElapsedTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetMousePosition", (PyCFunction) _wrap_GetMousePosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"IsBusy", (PyCFunction) _wrap_IsBusy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Now", (PyCFunction) _wrap_Now, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Shell", (PyCFunction) _wrap_Shell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StartTimer", (PyCFunction) _wrap_StartTimer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetOsVersion", (PyCFunction) _wrap_GetOsVersion, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetOsDescription", (PyCFunction) _wrap_GetOsDescription, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetFreeMemory", (PyCFunction) _wrap_GetFreeMemory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Shutdown", (PyCFunction) _wrap_Shutdown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sleep", (PyCFunction) _wrap_Sleep, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MilliSleep", (PyCFunction) _wrap_MilliSleep, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MicroSleep", (PyCFunction) _wrap_MicroSleep, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"EnableTopLevelWindows", (PyCFunction) _wrap_EnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StripMenuCodes", (PyCFunction) _wrap_StripMenuCodes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetEmailAddress", (PyCFunction) _wrap_GetEmailAddress, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetHostName", (PyCFunction) _wrap_GetHostName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetFullHostName", (PyCFunction) _wrap_GetFullHostName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetUserId", (PyCFunction) _wrap_GetUserId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetUserName", (PyCFunction) _wrap_GetUserName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetHomeDir", (PyCFunction) _wrap_GetHomeDir, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetUserHome", (PyCFunction) _wrap_GetUserHome, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetProcessId", (PyCFunction) _wrap_GetProcessId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Trap", (PyCFunction) _wrap_Trap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileSelector", (PyCFunction) _wrap_FileSelector, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LoadFileSelector", (PyCFunction) _wrap_LoadFileSelector, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SaveFileSelector", (PyCFunction) _wrap_SaveFileSelector, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirSelector", (PyCFunction) _wrap_DirSelector, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetTextFromUser", (PyCFunction) _wrap_GetTextFromUser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetPasswordFromUser", (PyCFunction) _wrap_GetPasswordFromUser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetSingleChoice", (PyCFunction) _wrap_GetSingleChoice, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetSingleChoiceIndex", (PyCFunction) _wrap_GetSingleChoiceIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MessageBox", (PyCFunction) _wrap_MessageBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetNumberFromUser", (PyCFunction) _wrap_GetNumberFromUser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDisplay", (PyCFunction) _wrap_ColourDisplay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DisplayDepth", (PyCFunction) _wrap_DisplayDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetDisplayDepth", (PyCFunction) _wrap_GetDisplayDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DisplaySize", (PyCFunction) _wrap_DisplaySize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetDisplaySize", (PyCFunction) _wrap_GetDisplaySize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DisplaySizeMM", (PyCFunction) _wrap_DisplaySizeMM, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetDisplaySizeMM", (PyCFunction) _wrap_GetDisplaySizeMM, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ClientDisplayRect", (PyCFunction) _wrap_ClientDisplayRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetClientDisplayRect", (PyCFunction) _wrap_GetClientDisplayRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SetCursor", (PyCFunction) _wrap_SetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BeginBusyCursor", (PyCFunction) _wrap_BeginBusyCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetActiveWindow", (PyCFunction) _wrap_GetActiveWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindWindowAtPoint", (PyCFunction) _wrap_FindWindowAtPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetTopLevelParent", (PyCFunction) _wrap_GetTopLevelParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetKeyState", (PyCFunction) _wrap_GetKeyState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WakeUpMainThread", (PyCFunction) _wrap_WakeUpMainThread, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MutexGuiEnter", (PyCFunction) _wrap_MutexGuiEnter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MutexGuiLeave", (PyCFunction) _wrap_MutexGuiLeave, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_MutexGuiLocker", (PyCFunction) _wrap_new_MutexGuiLocker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_MutexGuiLocker", (PyCFunction) _wrap_delete_MutexGuiLocker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MutexGuiLocker_swigregister", MutexGuiLocker_swigregister, METH_VARARGS },
-        { (char *)"Thread_IsMain", (PyCFunction) _wrap_Thread_IsMain, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_ToolTip", (PyCFunction) _wrap_new_ToolTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolTip_SetTip", (PyCFunction) _wrap_ToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolTip_GetTip", (PyCFunction) _wrap_ToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolTip_GetWindow", (PyCFunction) _wrap_ToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolTip_Enable", (PyCFunction) _wrap_ToolTip_Enable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolTip_SetDelay", (PyCFunction) _wrap_ToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ToolTip_swigregister", ToolTip_swigregister, METH_VARARGS },
-        { (char *)"new_Caret", (PyCFunction) _wrap_new_Caret, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Caret", (PyCFunction) _wrap_delete_Caret, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_IsOk", (PyCFunction) _wrap_Caret_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_IsVisible", (PyCFunction) _wrap_Caret_IsVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_GetPosition", (PyCFunction) _wrap_Caret_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_GetPositionTuple", (PyCFunction) _wrap_Caret_GetPositionTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_GetSize", (PyCFunction) _wrap_Caret_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_GetSizeTuple", (PyCFunction) _wrap_Caret_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_GetWindow", (PyCFunction) _wrap_Caret_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_MoveXY", (PyCFunction) _wrap_Caret_MoveXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_Move", (PyCFunction) _wrap_Caret_Move, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_SetSizeWH", (PyCFunction) _wrap_Caret_SetSizeWH, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_SetSize", (PyCFunction) _wrap_Caret_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_Show", (PyCFunction) _wrap_Caret_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_Hide", (PyCFunction) _wrap_Caret_Hide, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_swigregister", Caret_swigregister, METH_VARARGS },
-        { (char *)"Caret_GetBlinkTime", (PyCFunction) _wrap_Caret_GetBlinkTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Caret_SetBlinkTime", (PyCFunction) _wrap_Caret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_BusyCursor", (PyCFunction) _wrap_new_BusyCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_BusyCursor", (PyCFunction) _wrap_delete_BusyCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BusyCursor_swigregister", BusyCursor_swigregister, METH_VARARGS },
-        { (char *)"new_WindowDisabler", (PyCFunction) _wrap_new_WindowDisabler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_WindowDisabler", (PyCFunction) _wrap_delete_WindowDisabler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WindowDisabler_swigregister", WindowDisabler_swigregister, METH_VARARGS },
-        { (char *)"new_BusyInfo", (PyCFunction) _wrap_new_BusyInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_BusyInfo", (PyCFunction) _wrap_delete_BusyInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS },
-        { (char *)"new_StopWatch", (PyCFunction) _wrap_new_StopWatch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StopWatch_Pause", (PyCFunction) _wrap_StopWatch_Pause, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StopWatch_Resume", (PyCFunction) _wrap_StopWatch_Resume, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StopWatch_Time", (PyCFunction) _wrap_StopWatch_Time, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StopWatch_swigregister", StopWatch_swigregister, METH_VARARGS },
-        { (char *)"new_FileHistory", (PyCFunction) _wrap_new_FileHistory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FileHistory", (PyCFunction) _wrap_delete_FileHistory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_AddFileToHistory", (PyCFunction) _wrap_FileHistory_AddFileToHistory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_RemoveFileFromHistory", (PyCFunction) _wrap_FileHistory_RemoveFileFromHistory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_GetMaxFiles", (PyCFunction) _wrap_FileHistory_GetMaxFiles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_UseMenu", (PyCFunction) _wrap_FileHistory_UseMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_RemoveMenu", (PyCFunction) _wrap_FileHistory_RemoveMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_Load", (PyCFunction) _wrap_FileHistory_Load, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_Save", (PyCFunction) _wrap_FileHistory_Save, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_AddFilesToMenu", (PyCFunction) _wrap_FileHistory_AddFilesToMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_AddFilesToThisMenu", (PyCFunction) _wrap_FileHistory_AddFilesToThisMenu, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_GetHistoryFile", (PyCFunction) _wrap_FileHistory_GetHistoryFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_GetCount", (PyCFunction) _wrap_FileHistory_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileHistory_swigregister", FileHistory_swigregister, METH_VARARGS },
-        { (char *)"new_SingleInstanceChecker", (PyCFunction) _wrap_new_SingleInstanceChecker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSingleInstanceChecker", (PyCFunction) _wrap_new_PreSingleInstanceChecker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_SingleInstanceChecker", (PyCFunction) _wrap_delete_SingleInstanceChecker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleInstanceChecker_Create", (PyCFunction) _wrap_SingleInstanceChecker_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleInstanceChecker_IsAnotherRunning", (PyCFunction) _wrap_SingleInstanceChecker_IsAnotherRunning, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleInstanceChecker_swigregister", SingleInstanceChecker_swigregister, METH_VARARGS },
-        { (char *)"DrawWindowOnDC", (PyCFunction) _wrap_DrawWindowOnDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_TipProvider", (PyCFunction) _wrap_delete_TipProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipProvider_GetTip", (PyCFunction) _wrap_TipProvider_GetTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipProvider_GetCurrentTip", (PyCFunction) _wrap_TipProvider_GetCurrentTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipProvider_PreprocessTip", (PyCFunction) _wrap_TipProvider_PreprocessTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipProvider_swigregister", TipProvider_swigregister, METH_VARARGS },
-        { (char *)"new_PyTipProvider", (PyCFunction) _wrap_new_PyTipProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTipProvider__setCallbackInfo", (PyCFunction) _wrap_PyTipProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTipProvider_swigregister", PyTipProvider_swigregister, METH_VARARGS },
-        { (char *)"ShowTip", (PyCFunction) _wrap_ShowTip, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CreateFileTipProvider", (PyCFunction) _wrap_CreateFileTipProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Timer", (PyCFunction) _wrap_new_Timer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Timer", (PyCFunction) _wrap_delete_Timer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer__setCallbackInfo", (PyCFunction) _wrap_Timer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_SetOwner", (PyCFunction) _wrap_Timer_SetOwner, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_GetOwner", (PyCFunction) _wrap_Timer_GetOwner, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_Start", (PyCFunction) _wrap_Timer_Start, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_Stop", (PyCFunction) _wrap_Timer_Stop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_IsRunning", (PyCFunction) _wrap_Timer_IsRunning, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_GetInterval", (PyCFunction) _wrap_Timer_GetInterval, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_IsOneShot", (PyCFunction) _wrap_Timer_IsOneShot, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_GetId", (PyCFunction) _wrap_Timer_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Timer_swigregister", Timer_swigregister, METH_VARARGS },
-        { (char *)"new_TimerEvent", (PyCFunction) _wrap_new_TimerEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimerEvent_GetInterval", (PyCFunction) _wrap_TimerEvent_GetInterval, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimerEvent_swigregister", TimerEvent_swigregister, METH_VARARGS },
-        { (char *)"new_TimerRunner", _wrap_new_TimerRunner, METH_VARARGS },
-        { (char *)"delete_TimerRunner", (PyCFunction) _wrap_delete_TimerRunner, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimerRunner_Start", (PyCFunction) _wrap_TimerRunner_Start, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimerRunner_swigregister", TimerRunner_swigregister, METH_VARARGS },
-        { (char *)"new_Log", (PyCFunction) _wrap_new_Log, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_IsEnabled", (PyCFunction) _wrap_Log_IsEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_EnableLogging", (PyCFunction) _wrap_Log_EnableLogging, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_OnLog", (PyCFunction) _wrap_Log_OnLog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_Flush", (PyCFunction) _wrap_Log_Flush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_FlushActive", (PyCFunction) _wrap_Log_FlushActive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_GetActiveTarget", (PyCFunction) _wrap_Log_GetActiveTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_SetActiveTarget", (PyCFunction) _wrap_Log_SetActiveTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_Suspend", (PyCFunction) _wrap_Log_Suspend, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_Resume", (PyCFunction) _wrap_Log_Resume, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_SetVerbose", (PyCFunction) _wrap_Log_SetVerbose, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_SetLogLevel", (PyCFunction) _wrap_Log_SetLogLevel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_DontCreateOnDemand", (PyCFunction) _wrap_Log_DontCreateOnDemand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_SetTraceMask", (PyCFunction) _wrap_Log_SetTraceMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_AddTraceMask", (PyCFunction) _wrap_Log_AddTraceMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_RemoveTraceMask", (PyCFunction) _wrap_Log_RemoveTraceMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_ClearTraceMasks", (PyCFunction) _wrap_Log_ClearTraceMasks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_GetTraceMasks", (PyCFunction) _wrap_Log_GetTraceMasks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_SetTimestamp", (PyCFunction) _wrap_Log_SetTimestamp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_GetVerbose", (PyCFunction) _wrap_Log_GetVerbose, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_GetTraceMask", (PyCFunction) _wrap_Log_GetTraceMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_IsAllowedTraceMask", (PyCFunction) _wrap_Log_IsAllowedTraceMask, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_GetLogLevel", (PyCFunction) _wrap_Log_GetLogLevel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_GetTimestamp", (PyCFunction) _wrap_Log_GetTimestamp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_TimeStamp", (PyCFunction) _wrap_Log_TimeStamp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_Destroy", (PyCFunction) _wrap_Log_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Log_swigregister", Log_swigregister, METH_VARARGS },
-        { (char *)"new_LogStderr", (PyCFunction) _wrap_new_LogStderr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogStderr_swigregister", LogStderr_swigregister, METH_VARARGS },
-        { (char *)"new_LogTextCtrl", (PyCFunction) _wrap_new_LogTextCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogTextCtrl_swigregister", LogTextCtrl_swigregister, METH_VARARGS },
-        { (char *)"new_LogGui", (PyCFunction) _wrap_new_LogGui, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogGui_swigregister", LogGui_swigregister, METH_VARARGS },
-        { (char *)"new_LogWindow", (PyCFunction) _wrap_new_LogWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWindow_Show", (PyCFunction) _wrap_LogWindow_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWindow_GetFrame", (PyCFunction) _wrap_LogWindow_GetFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWindow_GetOldLog", (PyCFunction) _wrap_LogWindow_GetOldLog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWindow_IsPassingMessages", (PyCFunction) _wrap_LogWindow_IsPassingMessages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWindow_PassMessages", (PyCFunction) _wrap_LogWindow_PassMessages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWindow_swigregister", LogWindow_swigregister, METH_VARARGS },
-        { (char *)"new_LogChain", (PyCFunction) _wrap_new_LogChain, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogChain_SetLog", (PyCFunction) _wrap_LogChain_SetLog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogChain_PassMessages", (PyCFunction) _wrap_LogChain_PassMessages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogChain_IsPassingMessages", (PyCFunction) _wrap_LogChain_IsPassingMessages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogChain_GetOldLog", (PyCFunction) _wrap_LogChain_GetOldLog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogChain_swigregister", LogChain_swigregister, METH_VARARGS },
-        { (char *)"SysErrorCode", (PyCFunction) _wrap_SysErrorCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SysErrorMsg", (PyCFunction) _wrap_SysErrorMsg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogFatalError", (PyCFunction) _wrap_LogFatalError, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogError", (PyCFunction) _wrap_LogError, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogWarning", (PyCFunction) _wrap_LogWarning, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogMessage", (PyCFunction) _wrap_LogMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogInfo", (PyCFunction) _wrap_LogInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogDebug", (PyCFunction) _wrap_LogDebug, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogVerbose", (PyCFunction) _wrap_LogVerbose, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogStatus", (PyCFunction) _wrap_LogStatus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogStatusFrame", (PyCFunction) _wrap_LogStatusFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogSysError", (PyCFunction) _wrap_LogSysError, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS },
-        { (char *)"LogGeneric", (PyCFunction) _wrap_LogGeneric, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SafeShowMessage", (PyCFunction) _wrap_SafeShowMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_LogNull", (PyCFunction) _wrap_new_LogNull, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_LogNull", (PyCFunction) _wrap_delete_LogNull, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LogNull_swigregister", LogNull_swigregister, METH_VARARGS },
-        { (char *)"new_PyLog", (PyCFunction) _wrap_new_PyLog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLog__setCallbackInfo", (PyCFunction) _wrap_PyLog__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyLog_swigregister", PyLog_swigregister, METH_VARARGS },
-        { (char *)"Process_Kill", (PyCFunction) _wrap_Process_Kill, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_base_OnTerminate", (PyCFunction) _wrap_Process_base_OnTerminate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_Redirect", (PyCFunction) _wrap_Process_Redirect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_IsRedirected", (PyCFunction) _wrap_Process_IsRedirected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_Detach", (PyCFunction) _wrap_Process_Detach, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_GetInputStream", (PyCFunction) _wrap_Process_GetInputStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_GetErrorStream", (PyCFunction) _wrap_Process_GetErrorStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_GetOutputStream", (PyCFunction) _wrap_Process_GetOutputStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_CloseOutput", (PyCFunction) _wrap_Process_CloseOutput, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_IsInputOpened", (PyCFunction) _wrap_Process_IsInputOpened, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_IsInputAvailable", (PyCFunction) _wrap_Process_IsInputAvailable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_IsErrorAvailable", (PyCFunction) _wrap_Process_IsErrorAvailable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Process_swigregister", Process_swigregister, METH_VARARGS },
-        { (char *)"new_ProcessEvent", (PyCFunction) _wrap_new_ProcessEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_GetPid", (PyCFunction) _wrap_ProcessEvent_GetPid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_GetExitCode", (PyCFunction) _wrap_ProcessEvent_GetExitCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_m_pid_set", (PyCFunction) _wrap_ProcessEvent_m_pid_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_m_pid_get", (PyCFunction) _wrap_ProcessEvent_m_pid_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_m_exitcode_set", (PyCFunction) _wrap_ProcessEvent_m_exitcode_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_m_exitcode_get", (PyCFunction) _wrap_ProcessEvent_m_exitcode_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProcessEvent_swigregister", ProcessEvent_swigregister, METH_VARARGS },
-        { (char *)"Execute", (PyCFunction) _wrap_Execute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_Joystick", (PyCFunction) _wrap_new_Joystick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Joystick", (PyCFunction) _wrap_delete_Joystick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetPosition", (PyCFunction) _wrap_Joystick_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetZPosition", (PyCFunction) _wrap_Joystick_GetZPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetButtonState", (PyCFunction) _wrap_Joystick_GetButtonState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetPOVPosition", (PyCFunction) _wrap_Joystick_GetPOVPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetPOVCTSPosition", (PyCFunction) _wrap_Joystick_GetPOVCTSPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetRudderPosition", (PyCFunction) _wrap_Joystick_GetRudderPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetUPosition", (PyCFunction) _wrap_Joystick_GetUPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetVPosition", (PyCFunction) _wrap_Joystick_GetVPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetMovementThreshold", (PyCFunction) _wrap_Joystick_GetMovementThreshold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_SetMovementThreshold", (PyCFunction) _wrap_Joystick_SetMovementThreshold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_IsOk", (PyCFunction) _wrap_Joystick_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetNumberJoysticks", (PyCFunction) _wrap_Joystick_GetNumberJoysticks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetManufacturerId", (PyCFunction) _wrap_Joystick_GetManufacturerId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetProductId", (PyCFunction) _wrap_Joystick_GetProductId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetProductName", (PyCFunction) _wrap_Joystick_GetProductName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetXMin", (PyCFunction) _wrap_Joystick_GetXMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetYMin", (PyCFunction) _wrap_Joystick_GetYMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetZMin", (PyCFunction) _wrap_Joystick_GetZMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetXMax", (PyCFunction) _wrap_Joystick_GetXMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetYMax", (PyCFunction) _wrap_Joystick_GetYMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetZMax", (PyCFunction) _wrap_Joystick_GetZMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetNumberButtons", (PyCFunction) _wrap_Joystick_GetNumberButtons, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetNumberAxes", (PyCFunction) _wrap_Joystick_GetNumberAxes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetMaxButtons", (PyCFunction) _wrap_Joystick_GetMaxButtons, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetMaxAxes", (PyCFunction) _wrap_Joystick_GetMaxAxes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetPollingMin", (PyCFunction) _wrap_Joystick_GetPollingMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetPollingMax", (PyCFunction) _wrap_Joystick_GetPollingMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetRudderMin", (PyCFunction) _wrap_Joystick_GetRudderMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetRudderMax", (PyCFunction) _wrap_Joystick_GetRudderMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetUMin", (PyCFunction) _wrap_Joystick_GetUMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetUMax", (PyCFunction) _wrap_Joystick_GetUMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetVMin", (PyCFunction) _wrap_Joystick_GetVMin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_GetVMax", (PyCFunction) _wrap_Joystick_GetVMax, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasRudder", (PyCFunction) _wrap_Joystick_HasRudder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasZ", (PyCFunction) _wrap_Joystick_HasZ, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasU", (PyCFunction) _wrap_Joystick_HasU, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasV", (PyCFunction) _wrap_Joystick_HasV, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasPOV", (PyCFunction) _wrap_Joystick_HasPOV, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasPOV4Dir", (PyCFunction) _wrap_Joystick_HasPOV4Dir, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_HasPOVCTS", (PyCFunction) _wrap_Joystick_HasPOVCTS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_SetCapture", (PyCFunction) _wrap_Joystick_SetCapture, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_ReleaseCapture", (PyCFunction) _wrap_Joystick_ReleaseCapture, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Joystick_swigregister", Joystick_swigregister, METH_VARARGS },
-        { (char *)"JoystickEvent_m_pos_set", (PyCFunction) _wrap_JoystickEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_pos_get", (PyCFunction) _wrap_JoystickEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_zPosition_set", (PyCFunction) _wrap_JoystickEvent_m_zPosition_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_zPosition_get", (PyCFunction) _wrap_JoystickEvent_m_zPosition_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_buttonChange_set", (PyCFunction) _wrap_JoystickEvent_m_buttonChange_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_buttonChange_get", (PyCFunction) _wrap_JoystickEvent_m_buttonChange_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_buttonState_set", (PyCFunction) _wrap_JoystickEvent_m_buttonState_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_buttonState_get", (PyCFunction) _wrap_JoystickEvent_m_buttonState_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_joyStick_set", (PyCFunction) _wrap_JoystickEvent_m_joyStick_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_m_joyStick_get", (PyCFunction) _wrap_JoystickEvent_m_joyStick_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_JoystickEvent", (PyCFunction) _wrap_new_JoystickEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_GetPosition", (PyCFunction) _wrap_JoystickEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_GetZPosition", (PyCFunction) _wrap_JoystickEvent_GetZPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_GetButtonState", (PyCFunction) _wrap_JoystickEvent_GetButtonState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_GetButtonChange", (PyCFunction) _wrap_JoystickEvent_GetButtonChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_GetJoystick", (PyCFunction) _wrap_JoystickEvent_GetJoystick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_SetJoystick", (PyCFunction) _wrap_JoystickEvent_SetJoystick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_SetButtonState", (PyCFunction) _wrap_JoystickEvent_SetButtonState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_SetButtonChange", (PyCFunction) _wrap_JoystickEvent_SetButtonChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_SetPosition", (PyCFunction) _wrap_JoystickEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_SetZPosition", (PyCFunction) _wrap_JoystickEvent_SetZPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_IsButton", (PyCFunction) _wrap_JoystickEvent_IsButton, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_IsMove", (PyCFunction) _wrap_JoystickEvent_IsMove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_IsZMove", (PyCFunction) _wrap_JoystickEvent_IsZMove, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_ButtonDown", (PyCFunction) _wrap_JoystickEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_ButtonUp", (PyCFunction) _wrap_JoystickEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_ButtonIsDown", (PyCFunction) _wrap_JoystickEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"JoystickEvent_swigregister", JoystickEvent_swigregister, METH_VARARGS },
-        { (char *)"new_Sound", (PyCFunction) _wrap_new_Sound, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_SoundFromData", (PyCFunction) _wrap_new_SoundFromData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Sound", (PyCFunction) _wrap_delete_Sound, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_Create", (PyCFunction) _wrap_Sound_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_CreateFromData", (PyCFunction) _wrap_Sound_CreateFromData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_IsOk", (PyCFunction) _wrap_Sound_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_Play", (PyCFunction) _wrap_Sound_Play, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_PlaySound", (PyCFunction) _wrap_Sound_PlaySound, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_Stop", (PyCFunction) _wrap_Sound_Stop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Sound_swigregister", Sound_swigregister, METH_VARARGS },
-        { (char *)"new_FileTypeInfo", (PyCFunction) _wrap_new_FileTypeInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_FileTypeInfoSequence", (PyCFunction) _wrap_new_FileTypeInfoSequence, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_NullFileTypeInfo", (PyCFunction) _wrap_new_NullFileTypeInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_IsValid", (PyCFunction) _wrap_FileTypeInfo_IsValid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_SetIcon", (PyCFunction) _wrap_FileTypeInfo_SetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_SetShortDesc", (PyCFunction) _wrap_FileTypeInfo_SetShortDesc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetMimeType", (PyCFunction) _wrap_FileTypeInfo_GetMimeType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetOpenCommand", (PyCFunction) _wrap_FileTypeInfo_GetOpenCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetPrintCommand", (PyCFunction) _wrap_FileTypeInfo_GetPrintCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetShortDesc", (PyCFunction) _wrap_FileTypeInfo_GetShortDesc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetDescription", (PyCFunction) _wrap_FileTypeInfo_GetDescription, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetExtensions", (PyCFunction) _wrap_FileTypeInfo_GetExtensions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetExtensionsCount", (PyCFunction) _wrap_FileTypeInfo_GetExtensionsCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetIconFile", (PyCFunction) _wrap_FileTypeInfo_GetIconFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_GetIconIndex", (PyCFunction) _wrap_FileTypeInfo_GetIconIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileTypeInfo_swigregister", FileTypeInfo_swigregister, METH_VARARGS },
-        { (char *)"new_FileType", (PyCFunction) _wrap_new_FileType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FileType", (PyCFunction) _wrap_delete_FileType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetMimeType", (PyCFunction) _wrap_FileType_GetMimeType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetMimeTypes", (PyCFunction) _wrap_FileType_GetMimeTypes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetExtensions", (PyCFunction) _wrap_FileType_GetExtensions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetIcon", (PyCFunction) _wrap_FileType_GetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetIconInfo", (PyCFunction) _wrap_FileType_GetIconInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetDescription", (PyCFunction) _wrap_FileType_GetDescription, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetOpenCommand", (PyCFunction) _wrap_FileType_GetOpenCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetPrintCommand", (PyCFunction) _wrap_FileType_GetPrintCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_GetAllCommands", (PyCFunction) _wrap_FileType_GetAllCommands, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_SetCommand", (PyCFunction) _wrap_FileType_SetCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_SetDefaultIcon", (PyCFunction) _wrap_FileType_SetDefaultIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_Unassociate", (PyCFunction) _wrap_FileType_Unassociate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_ExpandCommand", (PyCFunction) _wrap_FileType_ExpandCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileType_swigregister", FileType_swigregister, METH_VARARGS },
-        { (char *)"MimeTypesManager_IsOfType", (PyCFunction) _wrap_MimeTypesManager_IsOfType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_MimeTypesManager", (PyCFunction) _wrap_new_MimeTypesManager, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_Initialize", (PyCFunction) _wrap_MimeTypesManager_Initialize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_ClearData", (PyCFunction) _wrap_MimeTypesManager_ClearData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_GetFileTypeFromExtension", (PyCFunction) _wrap_MimeTypesManager_GetFileTypeFromExtension, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_GetFileTypeFromMimeType", (PyCFunction) _wrap_MimeTypesManager_GetFileTypeFromMimeType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_ReadMailcap", (PyCFunction) _wrap_MimeTypesManager_ReadMailcap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_ReadMimeTypes", (PyCFunction) _wrap_MimeTypesManager_ReadMimeTypes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_EnumAllFileTypes", (PyCFunction) _wrap_MimeTypesManager_EnumAllFileTypes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_AddFallback", (PyCFunction) _wrap_MimeTypesManager_AddFallback, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_Associate", (PyCFunction) _wrap_MimeTypesManager_Associate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_Unassociate", (PyCFunction) _wrap_MimeTypesManager_Unassociate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_MimeTypesManager", (PyCFunction) _wrap_delete_MimeTypesManager, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MimeTypesManager_swigregister", MimeTypesManager_swigregister, METH_VARARGS },
-        { (char *)"new_ArtProvider", (PyCFunction) _wrap_new_ArtProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_PopProvider", (PyCFunction) _wrap_ArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_Destroy", (PyCFunction) _wrap_ArtProvider_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ArtProvider_swigregister", ArtProvider_swigregister, METH_VARARGS },
-        { (char *)"delete_ConfigBase", (PyCFunction) _wrap_delete_ConfigBase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Set", (PyCFunction) _wrap_ConfigBase_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Get", (PyCFunction) _wrap_ConfigBase_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Create", (PyCFunction) _wrap_ConfigBase_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_DontCreateOnDemand", (PyCFunction) _wrap_ConfigBase_DontCreateOnDemand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_SetPath", (PyCFunction) _wrap_ConfigBase_SetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetPath", (PyCFunction) _wrap_ConfigBase_GetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetFirstGroup", (PyCFunction) _wrap_ConfigBase_GetFirstGroup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetNextGroup", (PyCFunction) _wrap_ConfigBase_GetNextGroup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetFirstEntry", (PyCFunction) _wrap_ConfigBase_GetFirstEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetNextEntry", (PyCFunction) _wrap_ConfigBase_GetNextEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetNumberOfEntries", (PyCFunction) _wrap_ConfigBase_GetNumberOfEntries, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetNumberOfGroups", (PyCFunction) _wrap_ConfigBase_GetNumberOfGroups, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_HasGroup", (PyCFunction) _wrap_ConfigBase_HasGroup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_HasEntry", (PyCFunction) _wrap_ConfigBase_HasEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Exists", (PyCFunction) _wrap_ConfigBase_Exists, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetEntryType", (PyCFunction) _wrap_ConfigBase_GetEntryType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Read", (PyCFunction) _wrap_ConfigBase_Read, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_ReadInt", (PyCFunction) _wrap_ConfigBase_ReadInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_ReadFloat", (PyCFunction) _wrap_ConfigBase_ReadFloat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_ReadBool", (PyCFunction) _wrap_ConfigBase_ReadBool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Write", (PyCFunction) _wrap_ConfigBase_Write, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_WriteInt", (PyCFunction) _wrap_ConfigBase_WriteInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_WriteFloat", (PyCFunction) _wrap_ConfigBase_WriteFloat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_WriteBool", (PyCFunction) _wrap_ConfigBase_WriteBool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_Flush", (PyCFunction) _wrap_ConfigBase_Flush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_RenameEntry", (PyCFunction) _wrap_ConfigBase_RenameEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_RenameGroup", (PyCFunction) _wrap_ConfigBase_RenameGroup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_DeleteEntry", (PyCFunction) _wrap_ConfigBase_DeleteEntry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_DeleteGroup", (PyCFunction) _wrap_ConfigBase_DeleteGroup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_DeleteAll", (PyCFunction) _wrap_ConfigBase_DeleteAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_SetExpandEnvVars", (PyCFunction) _wrap_ConfigBase_SetExpandEnvVars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_IsExpandingEnvVars", (PyCFunction) _wrap_ConfigBase_IsExpandingEnvVars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_SetRecordDefaults", (PyCFunction) _wrap_ConfigBase_SetRecordDefaults, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_IsRecordingDefaults", (PyCFunction) _wrap_ConfigBase_IsRecordingDefaults, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_ExpandEnvVars", (PyCFunction) _wrap_ConfigBase_ExpandEnvVars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetAppName", (PyCFunction) _wrap_ConfigBase_GetAppName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetVendorName", (PyCFunction) _wrap_ConfigBase_GetVendorName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_SetAppName", (PyCFunction) _wrap_ConfigBase_SetAppName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_SetVendorName", (PyCFunction) _wrap_ConfigBase_SetVendorName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_SetStyle", (PyCFunction) _wrap_ConfigBase_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_GetStyle", (PyCFunction) _wrap_ConfigBase_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigBase_swigregister", ConfigBase_swigregister, METH_VARARGS },
-        { (char *)"new_Config", (PyCFunction) _wrap_new_Config, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Config", (PyCFunction) _wrap_delete_Config, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Config_swigregister", Config_swigregister, METH_VARARGS },
-        { (char *)"new_FileConfig", (PyCFunction) _wrap_new_FileConfig, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FileConfig", (PyCFunction) _wrap_delete_FileConfig, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileConfig_swigregister", FileConfig_swigregister, METH_VARARGS },
-        { (char *)"new_ConfigPathChanger", (PyCFunction) _wrap_new_ConfigPathChanger, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ConfigPathChanger", (PyCFunction) _wrap_delete_ConfigPathChanger, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigPathChanger_Name", (PyCFunction) _wrap_ConfigPathChanger_Name, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ConfigPathChanger_swigregister", ConfigPathChanger_swigregister, METH_VARARGS },
-        { (char *)"ExpandEnvVars", (PyCFunction) _wrap_ExpandEnvVars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetCountry", (PyCFunction) _wrap_DateTime_SetCountry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetCountry", (PyCFunction) _wrap_DateTime_GetCountry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsWestEuropeanCountry", (PyCFunction) _wrap_DateTime_IsWestEuropeanCountry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetCurrentYear", (PyCFunction) _wrap_DateTime_GetCurrentYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ConvertYearToBC", (PyCFunction) _wrap_DateTime_ConvertYearToBC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetCurrentMonth", (PyCFunction) _wrap_DateTime_GetCurrentMonth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsLeapYear", (PyCFunction) _wrap_DateTime_IsLeapYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetCentury", (PyCFunction) _wrap_DateTime_GetCentury, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetNumberOfDaysinYear", (PyCFunction) _wrap_DateTime_GetNumberOfDaysinYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetNumberOfDaysInMonth", (PyCFunction) _wrap_DateTime_GetNumberOfDaysInMonth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetMonthName", (PyCFunction) _wrap_DateTime_GetMonthName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetWeekDayName", (PyCFunction) _wrap_DateTime_GetWeekDayName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetAmPmStrings", (PyCFunction) _wrap_DateTime_GetAmPmStrings, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsDSTApplicable", (PyCFunction) _wrap_DateTime_IsDSTApplicable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetBeginDST", (PyCFunction) _wrap_DateTime_GetBeginDST, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetEndDST", (PyCFunction) _wrap_DateTime_GetEndDST, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_Now", (PyCFunction) _wrap_DateTime_Now, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_UNow", (PyCFunction) _wrap_DateTime_UNow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_Today", (PyCFunction) _wrap_DateTime_Today, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DateTime", (PyCFunction) _wrap_new_DateTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DateTimeFromTimeT", (PyCFunction) _wrap_new_DateTimeFromTimeT, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DateTimeFromJDN", (PyCFunction) _wrap_new_DateTimeFromJDN, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DateTimeFromHMS", (PyCFunction) _wrap_new_DateTimeFromHMS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DateTimeFromDMY", (PyCFunction) _wrap_new_DateTimeFromDMY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_DateTime", (PyCFunction) _wrap_delete_DateTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToCurrent", (PyCFunction) _wrap_DateTime_SetToCurrent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetTimeT", (PyCFunction) _wrap_DateTime_SetTimeT, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetJDN", (PyCFunction) _wrap_DateTime_SetJDN, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetHMS", (PyCFunction) _wrap_DateTime_SetHMS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_Set", (PyCFunction) _wrap_DateTime_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ResetTime", (PyCFunction) _wrap_DateTime_ResetTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetYear", (PyCFunction) _wrap_DateTime_SetYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetMonth", (PyCFunction) _wrap_DateTime_SetMonth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetDay", (PyCFunction) _wrap_DateTime_SetDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetHour", (PyCFunction) _wrap_DateTime_SetHour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetMinute", (PyCFunction) _wrap_DateTime_SetMinute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetSecond", (PyCFunction) _wrap_DateTime_SetSecond, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetMillisecond", (PyCFunction) _wrap_DateTime_SetMillisecond, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToWeekDayInSameWeek", (PyCFunction) _wrap_DateTime_SetToWeekDayInSameWeek, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetWeekDayInSameWeek", (PyCFunction) _wrap_DateTime_GetWeekDayInSameWeek, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToNextWeekDay", (PyCFunction) _wrap_DateTime_SetToNextWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetNextWeekDay", (PyCFunction) _wrap_DateTime_GetNextWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToPrevWeekDay", (PyCFunction) _wrap_DateTime_SetToPrevWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetPrevWeekDay", (PyCFunction) _wrap_DateTime_GetPrevWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToWeekDay", (PyCFunction) _wrap_DateTime_SetToWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToLastWeekDay", (PyCFunction) _wrap_DateTime_SetToLastWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetLastWeekDay", (PyCFunction) _wrap_DateTime_GetLastWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToTheWeek", (PyCFunction) _wrap_DateTime_SetToTheWeek, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetWeek", (PyCFunction) _wrap_DateTime_GetWeek, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToLastMonthDay", (PyCFunction) _wrap_DateTime_SetToLastMonthDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetLastMonthDay", (PyCFunction) _wrap_DateTime_GetLastMonthDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SetToYearDay", (PyCFunction) _wrap_DateTime_SetToYearDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetYearDay", (PyCFunction) _wrap_DateTime_GetYearDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetJulianDayNumber", (PyCFunction) _wrap_DateTime_GetJulianDayNumber, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetJDN", (PyCFunction) _wrap_DateTime_GetJDN, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetModifiedJulianDayNumber", (PyCFunction) _wrap_DateTime_GetModifiedJulianDayNumber, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetMJD", (PyCFunction) _wrap_DateTime_GetMJD, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetRataDie", (PyCFunction) _wrap_DateTime_GetRataDie, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ToTimezone", (PyCFunction) _wrap_DateTime_ToTimezone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_MakeTimezone", (PyCFunction) _wrap_DateTime_MakeTimezone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ToGMT", (PyCFunction) _wrap_DateTime_ToGMT, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_MakeGMT", (PyCFunction) _wrap_DateTime_MakeGMT, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsDST", (PyCFunction) _wrap_DateTime_IsDST, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsValid", (PyCFunction) _wrap_DateTime_IsValid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetTicks", (PyCFunction) _wrap_DateTime_GetTicks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetYear", (PyCFunction) _wrap_DateTime_GetYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetMonth", (PyCFunction) _wrap_DateTime_GetMonth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetDay", (PyCFunction) _wrap_DateTime_GetDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetWeekDay", (PyCFunction) _wrap_DateTime_GetWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetHour", (PyCFunction) _wrap_DateTime_GetHour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetMinute", (PyCFunction) _wrap_DateTime_GetMinute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetSecond", (PyCFunction) _wrap_DateTime_GetSecond, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetMillisecond", (PyCFunction) _wrap_DateTime_GetMillisecond, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetDayOfYear", (PyCFunction) _wrap_DateTime_GetDayOfYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetWeekOfYear", (PyCFunction) _wrap_DateTime_GetWeekOfYear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_GetWeekOfMonth", (PyCFunction) _wrap_DateTime_GetWeekOfMonth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsWorkDay", (PyCFunction) _wrap_DateTime_IsWorkDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsEqualTo", (PyCFunction) _wrap_DateTime_IsEqualTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsEarlierThan", (PyCFunction) _wrap_DateTime_IsEarlierThan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsLaterThan", (PyCFunction) _wrap_DateTime_IsLaterThan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsStrictlyBetween", (PyCFunction) _wrap_DateTime_IsStrictlyBetween, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsBetween", (PyCFunction) _wrap_DateTime_IsBetween, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsSameDate", (PyCFunction) _wrap_DateTime_IsSameDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsSameTime", (PyCFunction) _wrap_DateTime_IsSameTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_IsEqualUpTo", (PyCFunction) _wrap_DateTime_IsEqualUpTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_AddTS", (PyCFunction) _wrap_DateTime_AddTS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_AddDS", (PyCFunction) _wrap_DateTime_AddDS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SubtractTS", (PyCFunction) _wrap_DateTime_SubtractTS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_SubtractDS", (PyCFunction) _wrap_DateTime_SubtractDS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_Subtract", (PyCFunction) _wrap_DateTime_Subtract, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime___iadd__", _wrap_DateTime___iadd__, METH_VARARGS },
-        { (char *)"DateTime___isub__", _wrap_DateTime___isub__, METH_VARARGS },
-        { (char *)"DateTime___add__", _wrap_DateTime___add__, METH_VARARGS },
-        { (char *)"DateTime___sub__", _wrap_DateTime___sub__, METH_VARARGS },
-        { (char *)"DateTime___lt__", _wrap_DateTime___lt__, METH_VARARGS },
-        { (char *)"DateTime___le__", _wrap_DateTime___le__, METH_VARARGS },
-        { (char *)"DateTime___gt__", _wrap_DateTime___gt__, METH_VARARGS },
-        { (char *)"DateTime___ge__", _wrap_DateTime___ge__, METH_VARARGS },
-        { (char *)"DateTime___eq__", _wrap_DateTime___eq__, METH_VARARGS },
-        { (char *)"DateTime___ne__", _wrap_DateTime___ne__, METH_VARARGS },
-        { (char *)"DateTime_ParseRfc822Date", (PyCFunction) _wrap_DateTime_ParseRfc822Date, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ParseFormat", (PyCFunction) _wrap_DateTime_ParseFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ParseDateTime", (PyCFunction) _wrap_DateTime_ParseDateTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ParseDate", (PyCFunction) _wrap_DateTime_ParseDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_ParseTime", (PyCFunction) _wrap_DateTime_ParseTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_Format", (PyCFunction) _wrap_DateTime_Format, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_FormatDate", (PyCFunction) _wrap_DateTime_FormatDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_FormatTime", (PyCFunction) _wrap_DateTime_FormatTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_FormatISODate", (PyCFunction) _wrap_DateTime_FormatISODate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_FormatISOTime", (PyCFunction) _wrap_DateTime_FormatISOTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS },
-        { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Second", (PyCFunction) _wrap_TimeSpan_Second, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Minute", (PyCFunction) _wrap_TimeSpan_Minute, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Hours", (PyCFunction) _wrap_TimeSpan_Hours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Hour", (PyCFunction) _wrap_TimeSpan_Hour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Days", (PyCFunction) _wrap_TimeSpan_Days, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Day", (PyCFunction) _wrap_TimeSpan_Day, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Weeks", (PyCFunction) _wrap_TimeSpan_Weeks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Week", (PyCFunction) _wrap_TimeSpan_Week, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_TimeSpan", (PyCFunction) _wrap_new_TimeSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_TimeSpan", (PyCFunction) _wrap_delete_TimeSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Add", (PyCFunction) _wrap_TimeSpan_Add, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Subtract", (PyCFunction) _wrap_TimeSpan_Subtract, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Multiply", (PyCFunction) _wrap_TimeSpan_Multiply, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Neg", (PyCFunction) _wrap_TimeSpan_Neg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Abs", (PyCFunction) _wrap_TimeSpan_Abs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___iadd__", (PyCFunction) _wrap_TimeSpan___iadd__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___isub__", (PyCFunction) _wrap_TimeSpan___isub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___imul__", (PyCFunction) _wrap_TimeSpan___imul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___neg__", (PyCFunction) _wrap_TimeSpan___neg__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___add__", (PyCFunction) _wrap_TimeSpan___add__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___sub__", (PyCFunction) _wrap_TimeSpan___sub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___mul__", (PyCFunction) _wrap_TimeSpan___mul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___rmul__", (PyCFunction) _wrap_TimeSpan___rmul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___lt__", (PyCFunction) _wrap_TimeSpan___lt__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___le__", (PyCFunction) _wrap_TimeSpan___le__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___gt__", (PyCFunction) _wrap_TimeSpan___gt__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___ge__", (PyCFunction) _wrap_TimeSpan___ge__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___eq__", (PyCFunction) _wrap_TimeSpan___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan___ne__", (PyCFunction) _wrap_TimeSpan___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_IsNull", (PyCFunction) _wrap_TimeSpan_IsNull, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_IsPositive", (PyCFunction) _wrap_TimeSpan_IsPositive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_IsNegative", (PyCFunction) _wrap_TimeSpan_IsNegative, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_IsEqualTo", (PyCFunction) _wrap_TimeSpan_IsEqualTo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_IsLongerThan", (PyCFunction) _wrap_TimeSpan_IsLongerThan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_IsShorterThan", (PyCFunction) _wrap_TimeSpan_IsShorterThan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_GetWeeks", (PyCFunction) _wrap_TimeSpan_GetWeeks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_GetDays", (PyCFunction) _wrap_TimeSpan_GetDays, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_GetHours", (PyCFunction) _wrap_TimeSpan_GetHours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_GetMinutes", (PyCFunction) _wrap_TimeSpan_GetMinutes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_GetSeconds", (PyCFunction) _wrap_TimeSpan_GetSeconds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_GetMilliseconds", (PyCFunction) _wrap_TimeSpan_GetMilliseconds, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_Format", (PyCFunction) _wrap_TimeSpan_Format, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TimeSpan_swigregister", TimeSpan_swigregister, METH_VARARGS },
-        { (char *)"new_DateSpan", (PyCFunction) _wrap_new_DateSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_DateSpan", (PyCFunction) _wrap_delete_DateSpan, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Days", (PyCFunction) _wrap_DateSpan_Days, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Day", (PyCFunction) _wrap_DateSpan_Day, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Weeks", (PyCFunction) _wrap_DateSpan_Weeks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Week", (PyCFunction) _wrap_DateSpan_Week, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Months", (PyCFunction) _wrap_DateSpan_Months, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Month", (PyCFunction) _wrap_DateSpan_Month, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Years", (PyCFunction) _wrap_DateSpan_Years, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Year", (PyCFunction) _wrap_DateSpan_Year, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_SetYears", (PyCFunction) _wrap_DateSpan_SetYears, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_SetMonths", (PyCFunction) _wrap_DateSpan_SetMonths, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_SetWeeks", (PyCFunction) _wrap_DateSpan_SetWeeks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_SetDays", (PyCFunction) _wrap_DateSpan_SetDays, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_GetYears", (PyCFunction) _wrap_DateSpan_GetYears, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_GetMonths", (PyCFunction) _wrap_DateSpan_GetMonths, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_GetWeeks", (PyCFunction) _wrap_DateSpan_GetWeeks, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_GetDays", (PyCFunction) _wrap_DateSpan_GetDays, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_GetTotalDays", (PyCFunction) _wrap_DateSpan_GetTotalDays, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Add", (PyCFunction) _wrap_DateSpan_Add, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Subtract", (PyCFunction) _wrap_DateSpan_Subtract, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Neg", (PyCFunction) _wrap_DateSpan_Neg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_Multiply", (PyCFunction) _wrap_DateSpan_Multiply, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___iadd__", (PyCFunction) _wrap_DateSpan___iadd__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___isub__", (PyCFunction) _wrap_DateSpan___isub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___neg__", (PyCFunction) _wrap_DateSpan___neg__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___imul__", (PyCFunction) _wrap_DateSpan___imul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___add__", (PyCFunction) _wrap_DateSpan___add__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___sub__", (PyCFunction) _wrap_DateSpan___sub__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___mul__", (PyCFunction) _wrap_DateSpan___mul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___rmul__", (PyCFunction) _wrap_DateSpan___rmul__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___eq__", (PyCFunction) _wrap_DateSpan___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan___ne__", (PyCFunction) _wrap_DateSpan___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DateSpan_swigregister", DateSpan_swigregister, METH_VARARGS },
-        { (char *)"GetLocalTime", (PyCFunction) _wrap_GetLocalTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetUTCTime", (PyCFunction) _wrap_GetUTCTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetCurrentTime", (PyCFunction) _wrap_GetCurrentTime, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GetLocalTimeMillis", (PyCFunction) _wrap_GetLocalTimeMillis, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DataFormat", (PyCFunction) _wrap_new_DataFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_CustomDataFormat", (PyCFunction) _wrap_new_CustomDataFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_DataFormat", (PyCFunction) _wrap_delete_DataFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataFormat___eq__", _wrap_DataFormat___eq__, METH_VARARGS },
-        { (char *)"DataFormat___ne__", _wrap_DataFormat___ne__, METH_VARARGS },
-        { (char *)"DataFormat_SetType", (PyCFunction) _wrap_DataFormat_SetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataFormat_GetType", (PyCFunction) _wrap_DataFormat_GetType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataFormat_GetId", (PyCFunction) _wrap_DataFormat_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataFormat_SetId", (PyCFunction) _wrap_DataFormat_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataFormat_swigregister", DataFormat_swigregister, METH_VARARGS },
-        { (char *)"delete_DataObject", (PyCFunction) _wrap_delete_DataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_GetPreferredFormat", (PyCFunction) _wrap_DataObject_GetPreferredFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_GetFormatCount", (PyCFunction) _wrap_DataObject_GetFormatCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_IsSupported", (PyCFunction) _wrap_DataObject_IsSupported, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_GetDataSize", (PyCFunction) _wrap_DataObject_GetDataSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_GetAllFormats", (PyCFunction) _wrap_DataObject_GetAllFormats, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_GetDataHere", (PyCFunction) _wrap_DataObject_GetDataHere, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_SetData", (PyCFunction) _wrap_DataObject_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObject_swigregister", DataObject_swigregister, METH_VARARGS },
-        { (char *)"new_DataObjectSimple", (PyCFunction) _wrap_new_DataObjectSimple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectSimple_GetFormat", (PyCFunction) _wrap_DataObjectSimple_GetFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectSimple_SetFormat", (PyCFunction) _wrap_DataObjectSimple_SetFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectSimple_GetDataSize", (PyCFunction) _wrap_DataObjectSimple_GetDataSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectSimple_GetDataHere", (PyCFunction) _wrap_DataObjectSimple_GetDataHere, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectSimple_SetData", (PyCFunction) _wrap_DataObjectSimple_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectSimple_swigregister", DataObjectSimple_swigregister, METH_VARARGS },
-        { (char *)"new_PyDataObjectSimple", (PyCFunction) _wrap_new_PyDataObjectSimple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDataObjectSimple__setCallbackInfo", (PyCFunction) _wrap_PyDataObjectSimple__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyDataObjectSimple_swigregister", PyDataObjectSimple_swigregister, METH_VARARGS },
-        { (char *)"new_DataObjectComposite", (PyCFunction) _wrap_new_DataObjectComposite, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS },
-        { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDataObject_GetTextLength", (PyCFunction) _wrap_TextDataObject_GetTextLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDataObject_GetText", (PyCFunction) _wrap_TextDataObject_GetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDataObject_SetText", (PyCFunction) _wrap_TextDataObject_SetText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDataObject_swigregister", TextDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_PyTextDataObject", (PyCFunction) _wrap_new_PyTextDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextDataObject__setCallbackInfo", (PyCFunction) _wrap_PyTextDataObject__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyTextDataObject_swigregister", PyTextDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_BitmapDataObject", (PyCFunction) _wrap_new_BitmapDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapDataObject_GetBitmap", (PyCFunction) _wrap_BitmapDataObject_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapDataObject_SetBitmap", (PyCFunction) _wrap_BitmapDataObject_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"BitmapDataObject_swigregister", BitmapDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_PyBitmapDataObject", (PyCFunction) _wrap_new_PyBitmapDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapDataObject__setCallbackInfo", (PyCFunction) _wrap_PyBitmapDataObject__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyBitmapDataObject_swigregister", PyBitmapDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_FileDataObject", (PyCFunction) _wrap_new_FileDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDataObject_GetFilenames", (PyCFunction) _wrap_FileDataObject_GetFilenames, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDataObject_AddFile", (PyCFunction) _wrap_FileDataObject_AddFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDataObject_swigregister", FileDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_CustomDataObject", (PyCFunction) _wrap_new_CustomDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CustomDataObject_SetData", (PyCFunction) _wrap_CustomDataObject_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CustomDataObject_GetSize", (PyCFunction) _wrap_CustomDataObject_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CustomDataObject_GetData", (PyCFunction) _wrap_CustomDataObject_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CustomDataObject_swigregister", CustomDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_URLDataObject", (PyCFunction) _wrap_new_URLDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"URLDataObject_GetURL", (PyCFunction) _wrap_URLDataObject_GetURL, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"URLDataObject_SetURL", (PyCFunction) _wrap_URLDataObject_SetURL, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"URLDataObject_swigregister", URLDataObject_swigregister, METH_VARARGS },
-        { (char *)"new_MetafileDataObject", (PyCFunction) _wrap_new_MetafileDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetafileDataObject_SetMetafile", (PyCFunction) _wrap_MetafileDataObject_SetMetafile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetafileDataObject_GetMetafile", (PyCFunction) _wrap_MetafileDataObject_GetMetafile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MetafileDataObject_swigregister", MetafileDataObject_swigregister, METH_VARARGS },
-        { (char *)"IsDragResultOk", (PyCFunction) _wrap_IsDragResultOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_DropSource", (PyCFunction) _wrap_new_DropSource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource__setCallbackInfo", (PyCFunction) _wrap_DropSource__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_DropSource", (PyCFunction) _wrap_delete_DropSource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource_SetData", (PyCFunction) _wrap_DropSource_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource_GetDataObject", (PyCFunction) _wrap_DropSource_GetDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource_SetCursor", (PyCFunction) _wrap_DropSource_SetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS },
-        { (char *)"new_DropTarget", (PyCFunction) _wrap_new_DropTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_SetDataObject", (PyCFunction) _wrap_DropTarget_SetDataObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_base_OnEnter", (PyCFunction) _wrap_DropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_base_OnDragOver", (PyCFunction) _wrap_DropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_base_OnLeave", (PyCFunction) _wrap_DropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_base_OnDrop", (PyCFunction) _wrap_DropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_GetData", (PyCFunction) _wrap_DropTarget_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DropTarget_swigregister", DropTarget_swigregister, METH_VARARGS },
-        { (char *)"new_TextDropTarget", (PyCFunction) _wrap_new_TextDropTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget__setCallbackInfo", (PyCFunction) _wrap_TextDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget_base_OnEnter", (PyCFunction) _wrap_TextDropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget_base_OnDragOver", (PyCFunction) _wrap_TextDropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget_base_OnLeave", (PyCFunction) _wrap_TextDropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget_base_OnDrop", (PyCFunction) _wrap_TextDropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget_base_OnData", (PyCFunction) _wrap_TextDropTarget_base_OnData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextDropTarget_swigregister", TextDropTarget_swigregister, METH_VARARGS },
-        { (char *)"new_FileDropTarget", (PyCFunction) _wrap_new_FileDropTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget__setCallbackInfo", (PyCFunction) _wrap_FileDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget_base_OnEnter", (PyCFunction) _wrap_FileDropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget_base_OnDragOver", (PyCFunction) _wrap_FileDropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget_base_OnLeave", (PyCFunction) _wrap_FileDropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget_base_OnDrop", (PyCFunction) _wrap_FileDropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget_base_OnData", (PyCFunction) _wrap_FileDropTarget_base_OnData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDropTarget_swigregister", FileDropTarget_swigregister, METH_VARARGS },
-        { (char *)"new_Clipboard", (PyCFunction) _wrap_new_Clipboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Clipboard", (PyCFunction) _wrap_delete_Clipboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_Open", (PyCFunction) _wrap_Clipboard_Open, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_Close", (PyCFunction) _wrap_Clipboard_Close, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_IsOpened", (PyCFunction) _wrap_Clipboard_IsOpened, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_AddData", (PyCFunction) _wrap_Clipboard_AddData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_SetData", (PyCFunction) _wrap_Clipboard_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_IsSupported", (PyCFunction) _wrap_Clipboard_IsSupported, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_GetData", (PyCFunction) _wrap_Clipboard_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_Clear", (PyCFunction) _wrap_Clipboard_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_Flush", (PyCFunction) _wrap_Clipboard_Flush, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_UsePrimarySelection", (PyCFunction) _wrap_Clipboard_UsePrimarySelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_Get", (PyCFunction) _wrap_Clipboard_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Clipboard_swigregister", Clipboard_swigregister, METH_VARARGS },
-        { (char *)"new_ClipboardLocker", (PyCFunction) _wrap_new_ClipboardLocker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ClipboardLocker", (PyCFunction) _wrap_delete_ClipboardLocker, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ClipboardLocker___nonzero__", (PyCFunction) _wrap_ClipboardLocker___nonzero__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ClipboardLocker_swigregister", ClipboardLocker_swigregister, METH_VARARGS },
-        { (char *)"new_VideoMode", (PyCFunction) _wrap_new_VideoMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_VideoMode", (PyCFunction) _wrap_delete_VideoMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_Matches", (PyCFunction) _wrap_VideoMode_Matches, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_GetWidth", (PyCFunction) _wrap_VideoMode_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_GetHeight", (PyCFunction) _wrap_VideoMode_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_GetDepth", (PyCFunction) _wrap_VideoMode_GetDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_IsOk", (PyCFunction) _wrap_VideoMode_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode___eq__", (PyCFunction) _wrap_VideoMode___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode___ne__", (PyCFunction) _wrap_VideoMode___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_w_set", (PyCFunction) _wrap_VideoMode_w_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_w_get", (PyCFunction) _wrap_VideoMode_w_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_h_set", (PyCFunction) _wrap_VideoMode_h_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_h_get", (PyCFunction) _wrap_VideoMode_h_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_bpp_set", (PyCFunction) _wrap_VideoMode_bpp_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_bpp_get", (PyCFunction) _wrap_VideoMode_bpp_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_refresh_set", (PyCFunction) _wrap_VideoMode_refresh_set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_refresh_get", (PyCFunction) _wrap_VideoMode_refresh_get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VideoMode_swigregister", VideoMode_swigregister, METH_VARARGS },
-        { (char *)"new_Display", (PyCFunction) _wrap_new_Display, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Display", (PyCFunction) _wrap_delete_Display, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetCount", (PyCFunction) _wrap_Display_GetCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetFromPoint", (PyCFunction) _wrap_Display_GetFromPoint, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetFromWindow", (PyCFunction) _wrap_Display_GetFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_IsOk", (PyCFunction) _wrap_Display_IsOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetGeometry", (PyCFunction) _wrap_Display_GetGeometry, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetName", (PyCFunction) _wrap_Display_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_IsPrimary", (PyCFunction) _wrap_Display_IsPrimary, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetModes", (PyCFunction) _wrap_Display_GetModes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_GetCurrentMode", (PyCFunction) _wrap_Display_GetCurrentMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_ChangeMode", (PyCFunction) _wrap_Display_ChangeMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_ResetMode", (PyCFunction) _wrap_Display_ResetMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Display_swigregister", Display_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"SystemSettings_GetColour", (PyCFunction) _wrap_SystemSettings_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemSettings_GetFont", (PyCFunction) _wrap_SystemSettings_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemSettings_GetMetric", (PyCFunction) _wrap_SystemSettings_GetMetric, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemSettings_HasFeature", (PyCFunction) _wrap_SystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemSettings_GetScreenType", (PyCFunction) _wrap_SystemSettings_GetScreenType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemSettings_SetScreenType", (PyCFunction) _wrap_SystemSettings_SetScreenType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemSettings_swigregister", SystemSettings_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SystemOptions", (PyCFunction) _wrap_new_SystemOptions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemOptions_SetOption", (PyCFunction) _wrap_SystemOptions_SetOption, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemOptions_SetOptionInt", (PyCFunction) _wrap_SystemOptions_SetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemOptions_GetOption", (PyCFunction) _wrap_SystemOptions_GetOption, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemOptions_GetOptionInt", (PyCFunction) _wrap_SystemOptions_GetOptionInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemOptions_HasOption", (PyCFunction) _wrap_SystemOptions_HasOption, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SystemOptions_swigregister", SystemOptions_swigregister, METH_VARARGS, NULL },
+        { (char *)"NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"RegisterId", (PyCFunction) _wrap_RegisterId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetCurrentId", (PyCFunction) _wrap_GetCurrentId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IsStockID", (PyCFunction) _wrap_IsStockID, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IsStockLabel", (PyCFunction) _wrap_IsStockLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetStockLabel", (PyCFunction) _wrap_GetStockLabel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Bell", (PyCFunction) _wrap_Bell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EndBusyCursor", (PyCFunction) _wrap_EndBusyCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetElapsedTime", (PyCFunction) _wrap_GetElapsedTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetMousePosition", (PyCFunction) _wrap_GetMousePosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"IsBusy", (PyCFunction) _wrap_IsBusy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Now", (PyCFunction) _wrap_Now, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Shell", (PyCFunction) _wrap_Shell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StartTimer", (PyCFunction) _wrap_StartTimer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetOsVersion", (PyCFunction) _wrap_GetOsVersion, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetOsDescription", (PyCFunction) _wrap_GetOsDescription, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetFreeMemory", (PyCFunction) _wrap_GetFreeMemory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Shutdown", (PyCFunction) _wrap_Shutdown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sleep", (PyCFunction) _wrap_Sleep, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MilliSleep", (PyCFunction) _wrap_MilliSleep, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MicroSleep", (PyCFunction) _wrap_MicroSleep, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"EnableTopLevelWindows", (PyCFunction) _wrap_EnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StripMenuCodes", (PyCFunction) _wrap_StripMenuCodes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetEmailAddress", (PyCFunction) _wrap_GetEmailAddress, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetHostName", (PyCFunction) _wrap_GetHostName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetFullHostName", (PyCFunction) _wrap_GetFullHostName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetUserId", (PyCFunction) _wrap_GetUserId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetUserName", (PyCFunction) _wrap_GetUserName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetHomeDir", (PyCFunction) _wrap_GetHomeDir, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetUserHome", (PyCFunction) _wrap_GetUserHome, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetProcessId", (PyCFunction) _wrap_GetProcessId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Trap", (PyCFunction) _wrap_Trap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileSelector", (PyCFunction) _wrap_FileSelector, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LoadFileSelector", (PyCFunction) _wrap_LoadFileSelector, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SaveFileSelector", (PyCFunction) _wrap_SaveFileSelector, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirSelector", (PyCFunction) _wrap_DirSelector, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetTextFromUser", (PyCFunction) _wrap_GetTextFromUser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetPasswordFromUser", (PyCFunction) _wrap_GetPasswordFromUser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetSingleChoice", (PyCFunction) _wrap_GetSingleChoice, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetSingleChoiceIndex", (PyCFunction) _wrap_GetSingleChoiceIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MessageBox", (PyCFunction) _wrap_MessageBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetNumberFromUser", (PyCFunction) _wrap_GetNumberFromUser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDisplay", (PyCFunction) _wrap_ColourDisplay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DisplayDepth", (PyCFunction) _wrap_DisplayDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetDisplayDepth", (PyCFunction) _wrap_GetDisplayDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DisplaySize", (PyCFunction) _wrap_DisplaySize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetDisplaySize", (PyCFunction) _wrap_GetDisplaySize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DisplaySizeMM", (PyCFunction) _wrap_DisplaySizeMM, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetDisplaySizeMM", (PyCFunction) _wrap_GetDisplaySizeMM, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ClientDisplayRect", (PyCFunction) _wrap_ClientDisplayRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetClientDisplayRect", (PyCFunction) _wrap_GetClientDisplayRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SetCursor", (PyCFunction) _wrap_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BeginBusyCursor", (PyCFunction) _wrap_BeginBusyCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetActiveWindow", (PyCFunction) _wrap_GetActiveWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GenericFindWindowAtPoint", (PyCFunction) _wrap_GenericFindWindowAtPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindWindowAtPoint", (PyCFunction) _wrap_FindWindowAtPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetTopLevelParent", (PyCFunction) _wrap_GetTopLevelParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetKeyState", (PyCFunction) _wrap_GetKeyState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WakeUpMainThread", (PyCFunction) _wrap_WakeUpMainThread, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MutexGuiEnter", (PyCFunction) _wrap_MutexGuiEnter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MutexGuiLeave", (PyCFunction) _wrap_MutexGuiLeave, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_MutexGuiLocker", (PyCFunction) _wrap_new_MutexGuiLocker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_MutexGuiLocker", (PyCFunction) _wrap_delete_MutexGuiLocker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MutexGuiLocker_swigregister", MutexGuiLocker_swigregister, METH_VARARGS, NULL },
+        { (char *)"Thread_IsMain", (PyCFunction) _wrap_Thread_IsMain, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_ToolTip", (PyCFunction) _wrap_new_ToolTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolTip_SetTip", (PyCFunction) _wrap_ToolTip_SetTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolTip_GetTip", (PyCFunction) _wrap_ToolTip_GetTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolTip_GetWindow", (PyCFunction) _wrap_ToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolTip_Enable", (PyCFunction) _wrap_ToolTip_Enable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolTip_SetDelay", (PyCFunction) _wrap_ToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ToolTip_swigregister", ToolTip_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Caret", (PyCFunction) _wrap_new_Caret, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Caret", (PyCFunction) _wrap_delete_Caret, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_IsOk", (PyCFunction) _wrap_Caret_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_IsVisible", (PyCFunction) _wrap_Caret_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_GetPosition", (PyCFunction) _wrap_Caret_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_GetPositionTuple", (PyCFunction) _wrap_Caret_GetPositionTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_GetSize", (PyCFunction) _wrap_Caret_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_GetSizeTuple", (PyCFunction) _wrap_Caret_GetSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_GetWindow", (PyCFunction) _wrap_Caret_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_MoveXY", (PyCFunction) _wrap_Caret_MoveXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_Move", (PyCFunction) _wrap_Caret_Move, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_SetSizeWH", (PyCFunction) _wrap_Caret_SetSizeWH, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_SetSize", (PyCFunction) _wrap_Caret_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_Show", (PyCFunction) _wrap_Caret_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_Hide", (PyCFunction) _wrap_Caret_Hide, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_swigregister", Caret_swigregister, METH_VARARGS, NULL },
+        { (char *)"Caret_GetBlinkTime", (PyCFunction) _wrap_Caret_GetBlinkTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Caret_SetBlinkTime", (PyCFunction) _wrap_Caret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_BusyCursor", (PyCFunction) _wrap_new_BusyCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_BusyCursor", (PyCFunction) _wrap_delete_BusyCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BusyCursor_swigregister", BusyCursor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_WindowDisabler", (PyCFunction) _wrap_new_WindowDisabler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_WindowDisabler", (PyCFunction) _wrap_delete_WindowDisabler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WindowDisabler_swigregister", WindowDisabler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BusyInfo", (PyCFunction) _wrap_new_BusyInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_BusyInfo", (PyCFunction) _wrap_delete_BusyInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StopWatch", (PyCFunction) _wrap_new_StopWatch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StopWatch_Pause", (PyCFunction) _wrap_StopWatch_Pause, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StopWatch_Resume", (PyCFunction) _wrap_StopWatch_Resume, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StopWatch_Time", (PyCFunction) _wrap_StopWatch_Time, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StopWatch_swigregister", StopWatch_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileHistory", (PyCFunction) _wrap_new_FileHistory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FileHistory", (PyCFunction) _wrap_delete_FileHistory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_AddFileToHistory", (PyCFunction) _wrap_FileHistory_AddFileToHistory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_RemoveFileFromHistory", (PyCFunction) _wrap_FileHistory_RemoveFileFromHistory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_GetMaxFiles", (PyCFunction) _wrap_FileHistory_GetMaxFiles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_UseMenu", (PyCFunction) _wrap_FileHistory_UseMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_RemoveMenu", (PyCFunction) _wrap_FileHistory_RemoveMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_Load", (PyCFunction) _wrap_FileHistory_Load, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_Save", (PyCFunction) _wrap_FileHistory_Save, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_AddFilesToMenu", (PyCFunction) _wrap_FileHistory_AddFilesToMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_AddFilesToThisMenu", (PyCFunction) _wrap_FileHistory_AddFilesToThisMenu, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_GetHistoryFile", (PyCFunction) _wrap_FileHistory_GetHistoryFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_GetCount", (PyCFunction) _wrap_FileHistory_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileHistory_swigregister", FileHistory_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SingleInstanceChecker", (PyCFunction) _wrap_new_SingleInstanceChecker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSingleInstanceChecker", (PyCFunction) _wrap_new_PreSingleInstanceChecker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_SingleInstanceChecker", (PyCFunction) _wrap_delete_SingleInstanceChecker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleInstanceChecker_Create", (PyCFunction) _wrap_SingleInstanceChecker_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleInstanceChecker_IsAnotherRunning", (PyCFunction) _wrap_SingleInstanceChecker_IsAnotherRunning, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleInstanceChecker_swigregister", SingleInstanceChecker_swigregister, METH_VARARGS, NULL },
+        { (char *)"DrawWindowOnDC", (PyCFunction) _wrap_DrawWindowOnDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_TipProvider", (PyCFunction) _wrap_delete_TipProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipProvider_GetTip", (PyCFunction) _wrap_TipProvider_GetTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipProvider_GetCurrentTip", (PyCFunction) _wrap_TipProvider_GetCurrentTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipProvider_PreprocessTip", (PyCFunction) _wrap_TipProvider_PreprocessTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipProvider_swigregister", TipProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyTipProvider", (PyCFunction) _wrap_new_PyTipProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTipProvider__setCallbackInfo", (PyCFunction) _wrap_PyTipProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTipProvider_swigregister", PyTipProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"ShowTip", (PyCFunction) _wrap_ShowTip, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CreateFileTipProvider", (PyCFunction) _wrap_CreateFileTipProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Timer", (PyCFunction) _wrap_new_Timer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Timer", (PyCFunction) _wrap_delete_Timer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer__setCallbackInfo", (PyCFunction) _wrap_Timer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_SetOwner", (PyCFunction) _wrap_Timer_SetOwner, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_GetOwner", (PyCFunction) _wrap_Timer_GetOwner, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_Start", (PyCFunction) _wrap_Timer_Start, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_Stop", (PyCFunction) _wrap_Timer_Stop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_IsRunning", (PyCFunction) _wrap_Timer_IsRunning, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_GetInterval", (PyCFunction) _wrap_Timer_GetInterval, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_IsOneShot", (PyCFunction) _wrap_Timer_IsOneShot, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_GetId", (PyCFunction) _wrap_Timer_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Timer_swigregister", Timer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TimerEvent", (PyCFunction) _wrap_new_TimerEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimerEvent_GetInterval", (PyCFunction) _wrap_TimerEvent_GetInterval, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimerEvent_swigregister", TimerEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TimerRunner", _wrap_new_TimerRunner, METH_VARARGS, NULL },
+        { (char *)"delete_TimerRunner", (PyCFunction) _wrap_delete_TimerRunner, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimerRunner_Start", (PyCFunction) _wrap_TimerRunner_Start, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimerRunner_swigregister", TimerRunner_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Log", (PyCFunction) _wrap_new_Log, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_IsEnabled", (PyCFunction) _wrap_Log_IsEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_EnableLogging", (PyCFunction) _wrap_Log_EnableLogging, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_OnLog", (PyCFunction) _wrap_Log_OnLog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_Flush", (PyCFunction) _wrap_Log_Flush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_FlushActive", (PyCFunction) _wrap_Log_FlushActive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_GetActiveTarget", (PyCFunction) _wrap_Log_GetActiveTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_SetActiveTarget", (PyCFunction) _wrap_Log_SetActiveTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_Suspend", (PyCFunction) _wrap_Log_Suspend, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_Resume", (PyCFunction) _wrap_Log_Resume, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_SetVerbose", (PyCFunction) _wrap_Log_SetVerbose, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_SetLogLevel", (PyCFunction) _wrap_Log_SetLogLevel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_DontCreateOnDemand", (PyCFunction) _wrap_Log_DontCreateOnDemand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_SetTraceMask", (PyCFunction) _wrap_Log_SetTraceMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_AddTraceMask", (PyCFunction) _wrap_Log_AddTraceMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_RemoveTraceMask", (PyCFunction) _wrap_Log_RemoveTraceMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_ClearTraceMasks", (PyCFunction) _wrap_Log_ClearTraceMasks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_GetTraceMasks", (PyCFunction) _wrap_Log_GetTraceMasks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_SetTimestamp", (PyCFunction) _wrap_Log_SetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_GetVerbose", (PyCFunction) _wrap_Log_GetVerbose, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_GetTraceMask", (PyCFunction) _wrap_Log_GetTraceMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_IsAllowedTraceMask", (PyCFunction) _wrap_Log_IsAllowedTraceMask, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_GetLogLevel", (PyCFunction) _wrap_Log_GetLogLevel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_GetTimestamp", (PyCFunction) _wrap_Log_GetTimestamp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_TimeStamp", (PyCFunction) _wrap_Log_TimeStamp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_Destroy", (PyCFunction) _wrap_Log_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Log_swigregister", Log_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LogStderr", (PyCFunction) _wrap_new_LogStderr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogStderr_swigregister", LogStderr_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LogTextCtrl", (PyCFunction) _wrap_new_LogTextCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogTextCtrl_swigregister", LogTextCtrl_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LogGui", (PyCFunction) _wrap_new_LogGui, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogGui_swigregister", LogGui_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LogWindow", (PyCFunction) _wrap_new_LogWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWindow_Show", (PyCFunction) _wrap_LogWindow_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWindow_GetFrame", (PyCFunction) _wrap_LogWindow_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWindow_GetOldLog", (PyCFunction) _wrap_LogWindow_GetOldLog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWindow_IsPassingMessages", (PyCFunction) _wrap_LogWindow_IsPassingMessages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWindow_PassMessages", (PyCFunction) _wrap_LogWindow_PassMessages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWindow_swigregister", LogWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LogChain", (PyCFunction) _wrap_new_LogChain, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogChain_SetLog", (PyCFunction) _wrap_LogChain_SetLog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogChain_PassMessages", (PyCFunction) _wrap_LogChain_PassMessages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogChain_IsPassingMessages", (PyCFunction) _wrap_LogChain_IsPassingMessages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogChain_GetOldLog", (PyCFunction) _wrap_LogChain_GetOldLog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogChain_swigregister", LogChain_swigregister, METH_VARARGS, NULL },
+        { (char *)"SysErrorCode", (PyCFunction) _wrap_SysErrorCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SysErrorMsg", (PyCFunction) _wrap_SysErrorMsg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogFatalError", (PyCFunction) _wrap_LogFatalError, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogError", (PyCFunction) _wrap_LogError, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogWarning", (PyCFunction) _wrap_LogWarning, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogMessage", (PyCFunction) _wrap_LogMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogInfo", (PyCFunction) _wrap_LogInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogDebug", (PyCFunction) _wrap_LogDebug, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogVerbose", (PyCFunction) _wrap_LogVerbose, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogStatus", (PyCFunction) _wrap_LogStatus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogStatusFrame", (PyCFunction) _wrap_LogStatusFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogSysError", (PyCFunction) _wrap_LogSysError, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogTrace", _wrap_LogTrace, METH_VARARGS, NULL },
+        { (char *)"LogGeneric", (PyCFunction) _wrap_LogGeneric, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SafeShowMessage", (PyCFunction) _wrap_SafeShowMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_LogNull", (PyCFunction) _wrap_new_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_LogNull", (PyCFunction) _wrap_delete_LogNull, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LogNull_swigregister", LogNull_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyLog", (PyCFunction) _wrap_new_PyLog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLog__setCallbackInfo", (PyCFunction) _wrap_PyLog__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyLog_swigregister", PyLog_swigregister, METH_VARARGS, NULL },
+        { (char *)"Process_Kill", (PyCFunction) _wrap_Process_Kill, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_Exists", (PyCFunction) _wrap_Process_Exists, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_Open", (PyCFunction) _wrap_Process_Open, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Process", (PyCFunction) _wrap_new_Process, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process__setCallbackInfo", (PyCFunction) _wrap_Process__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_base_OnTerminate", (PyCFunction) _wrap_Process_base_OnTerminate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_Redirect", (PyCFunction) _wrap_Process_Redirect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_IsRedirected", (PyCFunction) _wrap_Process_IsRedirected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_Detach", (PyCFunction) _wrap_Process_Detach, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_GetInputStream", (PyCFunction) _wrap_Process_GetInputStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_GetErrorStream", (PyCFunction) _wrap_Process_GetErrorStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_GetOutputStream", (PyCFunction) _wrap_Process_GetOutputStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_CloseOutput", (PyCFunction) _wrap_Process_CloseOutput, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_IsInputOpened", (PyCFunction) _wrap_Process_IsInputOpened, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_IsInputAvailable", (PyCFunction) _wrap_Process_IsInputAvailable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_IsErrorAvailable", (PyCFunction) _wrap_Process_IsErrorAvailable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Process_swigregister", Process_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ProcessEvent", (PyCFunction) _wrap_new_ProcessEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_GetPid", (PyCFunction) _wrap_ProcessEvent_GetPid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_GetExitCode", (PyCFunction) _wrap_ProcessEvent_GetExitCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_m_pid_set", (PyCFunction) _wrap_ProcessEvent_m_pid_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_m_pid_get", (PyCFunction) _wrap_ProcessEvent_m_pid_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_m_exitcode_set", (PyCFunction) _wrap_ProcessEvent_m_exitcode_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_m_exitcode_get", (PyCFunction) _wrap_ProcessEvent_m_exitcode_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProcessEvent_swigregister", ProcessEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"Execute", (PyCFunction) _wrap_Execute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_Joystick", (PyCFunction) _wrap_new_Joystick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Joystick", (PyCFunction) _wrap_delete_Joystick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetPosition", (PyCFunction) _wrap_Joystick_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetZPosition", (PyCFunction) _wrap_Joystick_GetZPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetButtonState", (PyCFunction) _wrap_Joystick_GetButtonState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetPOVPosition", (PyCFunction) _wrap_Joystick_GetPOVPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetPOVCTSPosition", (PyCFunction) _wrap_Joystick_GetPOVCTSPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetRudderPosition", (PyCFunction) _wrap_Joystick_GetRudderPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetUPosition", (PyCFunction) _wrap_Joystick_GetUPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetVPosition", (PyCFunction) _wrap_Joystick_GetVPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetMovementThreshold", (PyCFunction) _wrap_Joystick_GetMovementThreshold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_SetMovementThreshold", (PyCFunction) _wrap_Joystick_SetMovementThreshold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_IsOk", (PyCFunction) _wrap_Joystick_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetNumberJoysticks", (PyCFunction) _wrap_Joystick_GetNumberJoysticks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetManufacturerId", (PyCFunction) _wrap_Joystick_GetManufacturerId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetProductId", (PyCFunction) _wrap_Joystick_GetProductId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetProductName", (PyCFunction) _wrap_Joystick_GetProductName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetXMin", (PyCFunction) _wrap_Joystick_GetXMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetYMin", (PyCFunction) _wrap_Joystick_GetYMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetZMin", (PyCFunction) _wrap_Joystick_GetZMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetXMax", (PyCFunction) _wrap_Joystick_GetXMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetYMax", (PyCFunction) _wrap_Joystick_GetYMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetZMax", (PyCFunction) _wrap_Joystick_GetZMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetNumberButtons", (PyCFunction) _wrap_Joystick_GetNumberButtons, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetNumberAxes", (PyCFunction) _wrap_Joystick_GetNumberAxes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetMaxButtons", (PyCFunction) _wrap_Joystick_GetMaxButtons, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetMaxAxes", (PyCFunction) _wrap_Joystick_GetMaxAxes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetPollingMin", (PyCFunction) _wrap_Joystick_GetPollingMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetPollingMax", (PyCFunction) _wrap_Joystick_GetPollingMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetRudderMin", (PyCFunction) _wrap_Joystick_GetRudderMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetRudderMax", (PyCFunction) _wrap_Joystick_GetRudderMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetUMin", (PyCFunction) _wrap_Joystick_GetUMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetUMax", (PyCFunction) _wrap_Joystick_GetUMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetVMin", (PyCFunction) _wrap_Joystick_GetVMin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_GetVMax", (PyCFunction) _wrap_Joystick_GetVMax, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasRudder", (PyCFunction) _wrap_Joystick_HasRudder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasZ", (PyCFunction) _wrap_Joystick_HasZ, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasU", (PyCFunction) _wrap_Joystick_HasU, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasV", (PyCFunction) _wrap_Joystick_HasV, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasPOV", (PyCFunction) _wrap_Joystick_HasPOV, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasPOV4Dir", (PyCFunction) _wrap_Joystick_HasPOV4Dir, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_HasPOVCTS", (PyCFunction) _wrap_Joystick_HasPOVCTS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_SetCapture", (PyCFunction) _wrap_Joystick_SetCapture, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_ReleaseCapture", (PyCFunction) _wrap_Joystick_ReleaseCapture, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Joystick_swigregister", Joystick_swigregister, METH_VARARGS, NULL },
+        { (char *)"JoystickEvent_m_pos_set", (PyCFunction) _wrap_JoystickEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_pos_get", (PyCFunction) _wrap_JoystickEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_zPosition_set", (PyCFunction) _wrap_JoystickEvent_m_zPosition_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_zPosition_get", (PyCFunction) _wrap_JoystickEvent_m_zPosition_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_buttonChange_set", (PyCFunction) _wrap_JoystickEvent_m_buttonChange_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_buttonChange_get", (PyCFunction) _wrap_JoystickEvent_m_buttonChange_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_buttonState_set", (PyCFunction) _wrap_JoystickEvent_m_buttonState_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_buttonState_get", (PyCFunction) _wrap_JoystickEvent_m_buttonState_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_joyStick_set", (PyCFunction) _wrap_JoystickEvent_m_joyStick_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_m_joyStick_get", (PyCFunction) _wrap_JoystickEvent_m_joyStick_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_JoystickEvent", (PyCFunction) _wrap_new_JoystickEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_GetPosition", (PyCFunction) _wrap_JoystickEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_GetZPosition", (PyCFunction) _wrap_JoystickEvent_GetZPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_GetButtonState", (PyCFunction) _wrap_JoystickEvent_GetButtonState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_GetButtonChange", (PyCFunction) _wrap_JoystickEvent_GetButtonChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_GetJoystick", (PyCFunction) _wrap_JoystickEvent_GetJoystick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_SetJoystick", (PyCFunction) _wrap_JoystickEvent_SetJoystick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_SetButtonState", (PyCFunction) _wrap_JoystickEvent_SetButtonState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_SetButtonChange", (PyCFunction) _wrap_JoystickEvent_SetButtonChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_SetPosition", (PyCFunction) _wrap_JoystickEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_SetZPosition", (PyCFunction) _wrap_JoystickEvent_SetZPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_IsButton", (PyCFunction) _wrap_JoystickEvent_IsButton, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_IsMove", (PyCFunction) _wrap_JoystickEvent_IsMove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_IsZMove", (PyCFunction) _wrap_JoystickEvent_IsZMove, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_ButtonDown", (PyCFunction) _wrap_JoystickEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_ButtonUp", (PyCFunction) _wrap_JoystickEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_ButtonIsDown", (PyCFunction) _wrap_JoystickEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"JoystickEvent_swigregister", JoystickEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Sound", (PyCFunction) _wrap_new_Sound, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_SoundFromData", (PyCFunction) _wrap_new_SoundFromData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Sound", (PyCFunction) _wrap_delete_Sound, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_Create", (PyCFunction) _wrap_Sound_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_CreateFromData", (PyCFunction) _wrap_Sound_CreateFromData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_IsOk", (PyCFunction) _wrap_Sound_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_Play", (PyCFunction) _wrap_Sound_Play, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_PlaySound", (PyCFunction) _wrap_Sound_PlaySound, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_Stop", (PyCFunction) _wrap_Sound_Stop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Sound_swigregister", Sound_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileTypeInfo", (PyCFunction) _wrap_new_FileTypeInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_FileTypeInfoSequence", (PyCFunction) _wrap_new_FileTypeInfoSequence, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_NullFileTypeInfo", (PyCFunction) _wrap_new_NullFileTypeInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_IsValid", (PyCFunction) _wrap_FileTypeInfo_IsValid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_SetIcon", (PyCFunction) _wrap_FileTypeInfo_SetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_SetShortDesc", (PyCFunction) _wrap_FileTypeInfo_SetShortDesc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetMimeType", (PyCFunction) _wrap_FileTypeInfo_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetOpenCommand", (PyCFunction) _wrap_FileTypeInfo_GetOpenCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetPrintCommand", (PyCFunction) _wrap_FileTypeInfo_GetPrintCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetShortDesc", (PyCFunction) _wrap_FileTypeInfo_GetShortDesc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetDescription", (PyCFunction) _wrap_FileTypeInfo_GetDescription, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetExtensions", (PyCFunction) _wrap_FileTypeInfo_GetExtensions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetExtensionsCount", (PyCFunction) _wrap_FileTypeInfo_GetExtensionsCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetIconFile", (PyCFunction) _wrap_FileTypeInfo_GetIconFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_GetIconIndex", (PyCFunction) _wrap_FileTypeInfo_GetIconIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileTypeInfo_swigregister", FileTypeInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileType", (PyCFunction) _wrap_new_FileType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FileType", (PyCFunction) _wrap_delete_FileType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetMimeType", (PyCFunction) _wrap_FileType_GetMimeType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetMimeTypes", (PyCFunction) _wrap_FileType_GetMimeTypes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetExtensions", (PyCFunction) _wrap_FileType_GetExtensions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetIcon", (PyCFunction) _wrap_FileType_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetIconInfo", (PyCFunction) _wrap_FileType_GetIconInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetDescription", (PyCFunction) _wrap_FileType_GetDescription, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetOpenCommand", (PyCFunction) _wrap_FileType_GetOpenCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetPrintCommand", (PyCFunction) _wrap_FileType_GetPrintCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_GetAllCommands", (PyCFunction) _wrap_FileType_GetAllCommands, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_SetCommand", (PyCFunction) _wrap_FileType_SetCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_SetDefaultIcon", (PyCFunction) _wrap_FileType_SetDefaultIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_Unassociate", (PyCFunction) _wrap_FileType_Unassociate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_ExpandCommand", (PyCFunction) _wrap_FileType_ExpandCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileType_swigregister", FileType_swigregister, METH_VARARGS, NULL },
+        { (char *)"MimeTypesManager_IsOfType", (PyCFunction) _wrap_MimeTypesManager_IsOfType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_MimeTypesManager", (PyCFunction) _wrap_new_MimeTypesManager, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_Initialize", (PyCFunction) _wrap_MimeTypesManager_Initialize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_ClearData", (PyCFunction) _wrap_MimeTypesManager_ClearData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_GetFileTypeFromExtension", (PyCFunction) _wrap_MimeTypesManager_GetFileTypeFromExtension, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_GetFileTypeFromMimeType", (PyCFunction) _wrap_MimeTypesManager_GetFileTypeFromMimeType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_ReadMailcap", (PyCFunction) _wrap_MimeTypesManager_ReadMailcap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_ReadMimeTypes", (PyCFunction) _wrap_MimeTypesManager_ReadMimeTypes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_EnumAllFileTypes", (PyCFunction) _wrap_MimeTypesManager_EnumAllFileTypes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_AddFallback", (PyCFunction) _wrap_MimeTypesManager_AddFallback, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_Associate", (PyCFunction) _wrap_MimeTypesManager_Associate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_Unassociate", (PyCFunction) _wrap_MimeTypesManager_Unassociate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_MimeTypesManager", (PyCFunction) _wrap_delete_MimeTypesManager, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MimeTypesManager_swigregister", MimeTypesManager_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ArtProvider", (PyCFunction) _wrap_new_ArtProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider__setCallbackInfo", (PyCFunction) _wrap_ArtProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_PushProvider", (PyCFunction) _wrap_ArtProvider_PushProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_PopProvider", (PyCFunction) _wrap_ArtProvider_PopProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_RemoveProvider", (PyCFunction) _wrap_ArtProvider_RemoveProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_GetBitmap", (PyCFunction) _wrap_ArtProvider_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_GetIcon", (PyCFunction) _wrap_ArtProvider_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_Destroy", (PyCFunction) _wrap_ArtProvider_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ArtProvider_swigregister", ArtProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"delete_ConfigBase", (PyCFunction) _wrap_delete_ConfigBase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Set", (PyCFunction) _wrap_ConfigBase_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Get", (PyCFunction) _wrap_ConfigBase_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Create", (PyCFunction) _wrap_ConfigBase_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_DontCreateOnDemand", (PyCFunction) _wrap_ConfigBase_DontCreateOnDemand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_SetPath", (PyCFunction) _wrap_ConfigBase_SetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetPath", (PyCFunction) _wrap_ConfigBase_GetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetFirstGroup", (PyCFunction) _wrap_ConfigBase_GetFirstGroup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetNextGroup", (PyCFunction) _wrap_ConfigBase_GetNextGroup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetFirstEntry", (PyCFunction) _wrap_ConfigBase_GetFirstEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetNextEntry", (PyCFunction) _wrap_ConfigBase_GetNextEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetNumberOfEntries", (PyCFunction) _wrap_ConfigBase_GetNumberOfEntries, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetNumberOfGroups", (PyCFunction) _wrap_ConfigBase_GetNumberOfGroups, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_HasGroup", (PyCFunction) _wrap_ConfigBase_HasGroup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_HasEntry", (PyCFunction) _wrap_ConfigBase_HasEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Exists", (PyCFunction) _wrap_ConfigBase_Exists, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetEntryType", (PyCFunction) _wrap_ConfigBase_GetEntryType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Read", (PyCFunction) _wrap_ConfigBase_Read, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_ReadInt", (PyCFunction) _wrap_ConfigBase_ReadInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_ReadFloat", (PyCFunction) _wrap_ConfigBase_ReadFloat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_ReadBool", (PyCFunction) _wrap_ConfigBase_ReadBool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Write", (PyCFunction) _wrap_ConfigBase_Write, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_WriteInt", (PyCFunction) _wrap_ConfigBase_WriteInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_WriteFloat", (PyCFunction) _wrap_ConfigBase_WriteFloat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_WriteBool", (PyCFunction) _wrap_ConfigBase_WriteBool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_Flush", (PyCFunction) _wrap_ConfigBase_Flush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_RenameEntry", (PyCFunction) _wrap_ConfigBase_RenameEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_RenameGroup", (PyCFunction) _wrap_ConfigBase_RenameGroup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_DeleteEntry", (PyCFunction) _wrap_ConfigBase_DeleteEntry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_DeleteGroup", (PyCFunction) _wrap_ConfigBase_DeleteGroup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_DeleteAll", (PyCFunction) _wrap_ConfigBase_DeleteAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_SetExpandEnvVars", (PyCFunction) _wrap_ConfigBase_SetExpandEnvVars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_IsExpandingEnvVars", (PyCFunction) _wrap_ConfigBase_IsExpandingEnvVars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_SetRecordDefaults", (PyCFunction) _wrap_ConfigBase_SetRecordDefaults, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_IsRecordingDefaults", (PyCFunction) _wrap_ConfigBase_IsRecordingDefaults, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_ExpandEnvVars", (PyCFunction) _wrap_ConfigBase_ExpandEnvVars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetAppName", (PyCFunction) _wrap_ConfigBase_GetAppName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetVendorName", (PyCFunction) _wrap_ConfigBase_GetVendorName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_SetAppName", (PyCFunction) _wrap_ConfigBase_SetAppName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_SetVendorName", (PyCFunction) _wrap_ConfigBase_SetVendorName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_SetStyle", (PyCFunction) _wrap_ConfigBase_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_GetStyle", (PyCFunction) _wrap_ConfigBase_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigBase_swigregister", ConfigBase_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Config", (PyCFunction) _wrap_new_Config, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Config", (PyCFunction) _wrap_delete_Config, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Config_swigregister", Config_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileConfig", (PyCFunction) _wrap_new_FileConfig, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FileConfig", (PyCFunction) _wrap_delete_FileConfig, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileConfig_swigregister", FileConfig_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ConfigPathChanger", (PyCFunction) _wrap_new_ConfigPathChanger, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ConfigPathChanger", (PyCFunction) _wrap_delete_ConfigPathChanger, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigPathChanger_Name", (PyCFunction) _wrap_ConfigPathChanger_Name, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ConfigPathChanger_swigregister", ConfigPathChanger_swigregister, METH_VARARGS, NULL },
+        { (char *)"ExpandEnvVars", (PyCFunction) _wrap_ExpandEnvVars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetCountry", (PyCFunction) _wrap_DateTime_SetCountry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetCountry", (PyCFunction) _wrap_DateTime_GetCountry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsWestEuropeanCountry", (PyCFunction) _wrap_DateTime_IsWestEuropeanCountry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetCurrentYear", (PyCFunction) _wrap_DateTime_GetCurrentYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ConvertYearToBC", (PyCFunction) _wrap_DateTime_ConvertYearToBC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetCurrentMonth", (PyCFunction) _wrap_DateTime_GetCurrentMonth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsLeapYear", (PyCFunction) _wrap_DateTime_IsLeapYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetCentury", (PyCFunction) _wrap_DateTime_GetCentury, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetNumberOfDaysinYear", (PyCFunction) _wrap_DateTime_GetNumberOfDaysinYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetNumberOfDaysInMonth", (PyCFunction) _wrap_DateTime_GetNumberOfDaysInMonth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetMonthName", (PyCFunction) _wrap_DateTime_GetMonthName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetWeekDayName", (PyCFunction) _wrap_DateTime_GetWeekDayName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetAmPmStrings", (PyCFunction) _wrap_DateTime_GetAmPmStrings, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsDSTApplicable", (PyCFunction) _wrap_DateTime_IsDSTApplicable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetBeginDST", (PyCFunction) _wrap_DateTime_GetBeginDST, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetEndDST", (PyCFunction) _wrap_DateTime_GetEndDST, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_Now", (PyCFunction) _wrap_DateTime_Now, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_UNow", (PyCFunction) _wrap_DateTime_UNow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_Today", (PyCFunction) _wrap_DateTime_Today, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DateTime", (PyCFunction) _wrap_new_DateTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DateTimeFromTimeT", (PyCFunction) _wrap_new_DateTimeFromTimeT, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DateTimeFromJDN", (PyCFunction) _wrap_new_DateTimeFromJDN, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DateTimeFromHMS", (PyCFunction) _wrap_new_DateTimeFromHMS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DateTimeFromDMY", (PyCFunction) _wrap_new_DateTimeFromDMY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_DateTime", (PyCFunction) _wrap_delete_DateTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToCurrent", (PyCFunction) _wrap_DateTime_SetToCurrent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetTimeT", (PyCFunction) _wrap_DateTime_SetTimeT, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetJDN", (PyCFunction) _wrap_DateTime_SetJDN, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetHMS", (PyCFunction) _wrap_DateTime_SetHMS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_Set", (PyCFunction) _wrap_DateTime_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ResetTime", (PyCFunction) _wrap_DateTime_ResetTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetYear", (PyCFunction) _wrap_DateTime_SetYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetMonth", (PyCFunction) _wrap_DateTime_SetMonth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetDay", (PyCFunction) _wrap_DateTime_SetDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetHour", (PyCFunction) _wrap_DateTime_SetHour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetMinute", (PyCFunction) _wrap_DateTime_SetMinute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetSecond", (PyCFunction) _wrap_DateTime_SetSecond, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetMillisecond", (PyCFunction) _wrap_DateTime_SetMillisecond, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToWeekDayInSameWeek", (PyCFunction) _wrap_DateTime_SetToWeekDayInSameWeek, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetWeekDayInSameWeek", (PyCFunction) _wrap_DateTime_GetWeekDayInSameWeek, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToNextWeekDay", (PyCFunction) _wrap_DateTime_SetToNextWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetNextWeekDay", (PyCFunction) _wrap_DateTime_GetNextWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToPrevWeekDay", (PyCFunction) _wrap_DateTime_SetToPrevWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetPrevWeekDay", (PyCFunction) _wrap_DateTime_GetPrevWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToWeekDay", (PyCFunction) _wrap_DateTime_SetToWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToLastWeekDay", (PyCFunction) _wrap_DateTime_SetToLastWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetLastWeekDay", (PyCFunction) _wrap_DateTime_GetLastWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToTheWeek", (PyCFunction) _wrap_DateTime_SetToTheWeek, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetWeek", (PyCFunction) _wrap_DateTime_GetWeek, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToLastMonthDay", (PyCFunction) _wrap_DateTime_SetToLastMonthDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetLastMonthDay", (PyCFunction) _wrap_DateTime_GetLastMonthDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SetToYearDay", (PyCFunction) _wrap_DateTime_SetToYearDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetYearDay", (PyCFunction) _wrap_DateTime_GetYearDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetJulianDayNumber", (PyCFunction) _wrap_DateTime_GetJulianDayNumber, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetJDN", (PyCFunction) _wrap_DateTime_GetJDN, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetModifiedJulianDayNumber", (PyCFunction) _wrap_DateTime_GetModifiedJulianDayNumber, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetMJD", (PyCFunction) _wrap_DateTime_GetMJD, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetRataDie", (PyCFunction) _wrap_DateTime_GetRataDie, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ToTimezone", (PyCFunction) _wrap_DateTime_ToTimezone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_MakeTimezone", (PyCFunction) _wrap_DateTime_MakeTimezone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ToGMT", (PyCFunction) _wrap_DateTime_ToGMT, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_MakeGMT", (PyCFunction) _wrap_DateTime_MakeGMT, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsDST", (PyCFunction) _wrap_DateTime_IsDST, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsValid", (PyCFunction) _wrap_DateTime_IsValid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetTicks", (PyCFunction) _wrap_DateTime_GetTicks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetYear", (PyCFunction) _wrap_DateTime_GetYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetMonth", (PyCFunction) _wrap_DateTime_GetMonth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetDay", (PyCFunction) _wrap_DateTime_GetDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetWeekDay", (PyCFunction) _wrap_DateTime_GetWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetHour", (PyCFunction) _wrap_DateTime_GetHour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetMinute", (PyCFunction) _wrap_DateTime_GetMinute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetSecond", (PyCFunction) _wrap_DateTime_GetSecond, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetMillisecond", (PyCFunction) _wrap_DateTime_GetMillisecond, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetDayOfYear", (PyCFunction) _wrap_DateTime_GetDayOfYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetWeekOfYear", (PyCFunction) _wrap_DateTime_GetWeekOfYear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_GetWeekOfMonth", (PyCFunction) _wrap_DateTime_GetWeekOfMonth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsWorkDay", (PyCFunction) _wrap_DateTime_IsWorkDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsEqualTo", (PyCFunction) _wrap_DateTime_IsEqualTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsEarlierThan", (PyCFunction) _wrap_DateTime_IsEarlierThan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsLaterThan", (PyCFunction) _wrap_DateTime_IsLaterThan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsStrictlyBetween", (PyCFunction) _wrap_DateTime_IsStrictlyBetween, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsBetween", (PyCFunction) _wrap_DateTime_IsBetween, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsSameDate", (PyCFunction) _wrap_DateTime_IsSameDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsSameTime", (PyCFunction) _wrap_DateTime_IsSameTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_IsEqualUpTo", (PyCFunction) _wrap_DateTime_IsEqualUpTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_AddTS", (PyCFunction) _wrap_DateTime_AddTS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_AddDS", (PyCFunction) _wrap_DateTime_AddDS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SubtractTS", (PyCFunction) _wrap_DateTime_SubtractTS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_SubtractDS", (PyCFunction) _wrap_DateTime_SubtractDS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_Subtract", (PyCFunction) _wrap_DateTime_Subtract, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime___iadd__", _wrap_DateTime___iadd__, METH_VARARGS, NULL },
+        { (char *)"DateTime___isub__", _wrap_DateTime___isub__, METH_VARARGS, NULL },
+        { (char *)"DateTime___add__", _wrap_DateTime___add__, METH_VARARGS, NULL },
+        { (char *)"DateTime___sub__", _wrap_DateTime___sub__, METH_VARARGS, NULL },
+        { (char *)"DateTime___lt__", _wrap_DateTime___lt__, METH_VARARGS, NULL },
+        { (char *)"DateTime___le__", _wrap_DateTime___le__, METH_VARARGS, NULL },
+        { (char *)"DateTime___gt__", _wrap_DateTime___gt__, METH_VARARGS, NULL },
+        { (char *)"DateTime___ge__", _wrap_DateTime___ge__, METH_VARARGS, NULL },
+        { (char *)"DateTime___eq__", _wrap_DateTime___eq__, METH_VARARGS, NULL },
+        { (char *)"DateTime___ne__", _wrap_DateTime___ne__, METH_VARARGS, NULL },
+        { (char *)"DateTime_ParseRfc822Date", (PyCFunction) _wrap_DateTime_ParseRfc822Date, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ParseFormat", (PyCFunction) _wrap_DateTime_ParseFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ParseDateTime", (PyCFunction) _wrap_DateTime_ParseDateTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ParseDate", (PyCFunction) _wrap_DateTime_ParseDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_ParseTime", (PyCFunction) _wrap_DateTime_ParseTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_Format", (PyCFunction) _wrap_DateTime_Format, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_FormatDate", (PyCFunction) _wrap_DateTime_FormatDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_FormatTime", (PyCFunction) _wrap_DateTime_FormatTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_FormatISODate", (PyCFunction) _wrap_DateTime_FormatISODate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_FormatISOTime", (PyCFunction) _wrap_DateTime_FormatISOTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL },
+        { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Second", (PyCFunction) _wrap_TimeSpan_Second, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Minute", (PyCFunction) _wrap_TimeSpan_Minute, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Hours", (PyCFunction) _wrap_TimeSpan_Hours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Hour", (PyCFunction) _wrap_TimeSpan_Hour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Days", (PyCFunction) _wrap_TimeSpan_Days, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Day", (PyCFunction) _wrap_TimeSpan_Day, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Weeks", (PyCFunction) _wrap_TimeSpan_Weeks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Week", (PyCFunction) _wrap_TimeSpan_Week, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_TimeSpan", (PyCFunction) _wrap_new_TimeSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_TimeSpan", (PyCFunction) _wrap_delete_TimeSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Add", (PyCFunction) _wrap_TimeSpan_Add, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Subtract", (PyCFunction) _wrap_TimeSpan_Subtract, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Multiply", (PyCFunction) _wrap_TimeSpan_Multiply, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Neg", (PyCFunction) _wrap_TimeSpan_Neg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Abs", (PyCFunction) _wrap_TimeSpan_Abs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___iadd__", (PyCFunction) _wrap_TimeSpan___iadd__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___isub__", (PyCFunction) _wrap_TimeSpan___isub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___imul__", (PyCFunction) _wrap_TimeSpan___imul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___neg__", (PyCFunction) _wrap_TimeSpan___neg__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___add__", (PyCFunction) _wrap_TimeSpan___add__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___sub__", (PyCFunction) _wrap_TimeSpan___sub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___mul__", (PyCFunction) _wrap_TimeSpan___mul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___rmul__", (PyCFunction) _wrap_TimeSpan___rmul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___lt__", (PyCFunction) _wrap_TimeSpan___lt__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___le__", (PyCFunction) _wrap_TimeSpan___le__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___gt__", (PyCFunction) _wrap_TimeSpan___gt__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___ge__", (PyCFunction) _wrap_TimeSpan___ge__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___eq__", (PyCFunction) _wrap_TimeSpan___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan___ne__", (PyCFunction) _wrap_TimeSpan___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_IsNull", (PyCFunction) _wrap_TimeSpan_IsNull, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_IsPositive", (PyCFunction) _wrap_TimeSpan_IsPositive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_IsNegative", (PyCFunction) _wrap_TimeSpan_IsNegative, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_IsEqualTo", (PyCFunction) _wrap_TimeSpan_IsEqualTo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_IsLongerThan", (PyCFunction) _wrap_TimeSpan_IsLongerThan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_IsShorterThan", (PyCFunction) _wrap_TimeSpan_IsShorterThan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_GetWeeks", (PyCFunction) _wrap_TimeSpan_GetWeeks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_GetDays", (PyCFunction) _wrap_TimeSpan_GetDays, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_GetHours", (PyCFunction) _wrap_TimeSpan_GetHours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_GetMinutes", (PyCFunction) _wrap_TimeSpan_GetMinutes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_GetSeconds", (PyCFunction) _wrap_TimeSpan_GetSeconds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_GetMilliseconds", (PyCFunction) _wrap_TimeSpan_GetMilliseconds, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_Format", (PyCFunction) _wrap_TimeSpan_Format, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TimeSpan_swigregister", TimeSpan_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DateSpan", (PyCFunction) _wrap_new_DateSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_DateSpan", (PyCFunction) _wrap_delete_DateSpan, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Days", (PyCFunction) _wrap_DateSpan_Days, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Day", (PyCFunction) _wrap_DateSpan_Day, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Weeks", (PyCFunction) _wrap_DateSpan_Weeks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Week", (PyCFunction) _wrap_DateSpan_Week, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Months", (PyCFunction) _wrap_DateSpan_Months, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Month", (PyCFunction) _wrap_DateSpan_Month, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Years", (PyCFunction) _wrap_DateSpan_Years, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Year", (PyCFunction) _wrap_DateSpan_Year, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_SetYears", (PyCFunction) _wrap_DateSpan_SetYears, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_SetMonths", (PyCFunction) _wrap_DateSpan_SetMonths, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_SetWeeks", (PyCFunction) _wrap_DateSpan_SetWeeks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_SetDays", (PyCFunction) _wrap_DateSpan_SetDays, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_GetYears", (PyCFunction) _wrap_DateSpan_GetYears, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_GetMonths", (PyCFunction) _wrap_DateSpan_GetMonths, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_GetWeeks", (PyCFunction) _wrap_DateSpan_GetWeeks, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_GetDays", (PyCFunction) _wrap_DateSpan_GetDays, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_GetTotalDays", (PyCFunction) _wrap_DateSpan_GetTotalDays, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Add", (PyCFunction) _wrap_DateSpan_Add, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Subtract", (PyCFunction) _wrap_DateSpan_Subtract, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Neg", (PyCFunction) _wrap_DateSpan_Neg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_Multiply", (PyCFunction) _wrap_DateSpan_Multiply, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___iadd__", (PyCFunction) _wrap_DateSpan___iadd__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___isub__", (PyCFunction) _wrap_DateSpan___isub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___neg__", (PyCFunction) _wrap_DateSpan___neg__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___imul__", (PyCFunction) _wrap_DateSpan___imul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___add__", (PyCFunction) _wrap_DateSpan___add__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___sub__", (PyCFunction) _wrap_DateSpan___sub__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___mul__", (PyCFunction) _wrap_DateSpan___mul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___rmul__", (PyCFunction) _wrap_DateSpan___rmul__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___eq__", (PyCFunction) _wrap_DateSpan___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan___ne__", (PyCFunction) _wrap_DateSpan___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DateSpan_swigregister", DateSpan_swigregister, METH_VARARGS, NULL },
+        { (char *)"GetLocalTime", (PyCFunction) _wrap_GetLocalTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetUTCTime", (PyCFunction) _wrap_GetUTCTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetCurrentTime", (PyCFunction) _wrap_GetCurrentTime, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GetLocalTimeMillis", (PyCFunction) _wrap_GetLocalTimeMillis, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DataFormat", (PyCFunction) _wrap_new_DataFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_CustomDataFormat", (PyCFunction) _wrap_new_CustomDataFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_DataFormat", (PyCFunction) _wrap_delete_DataFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataFormat___eq__", _wrap_DataFormat___eq__, METH_VARARGS, NULL },
+        { (char *)"DataFormat___ne__", _wrap_DataFormat___ne__, METH_VARARGS, NULL },
+        { (char *)"DataFormat_SetType", (PyCFunction) _wrap_DataFormat_SetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataFormat_GetType", (PyCFunction) _wrap_DataFormat_GetType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataFormat_GetId", (PyCFunction) _wrap_DataFormat_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataFormat_SetId", (PyCFunction) _wrap_DataFormat_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataFormat_swigregister", DataFormat_swigregister, METH_VARARGS, NULL },
+        { (char *)"delete_DataObject", (PyCFunction) _wrap_delete_DataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_GetPreferredFormat", (PyCFunction) _wrap_DataObject_GetPreferredFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_GetFormatCount", (PyCFunction) _wrap_DataObject_GetFormatCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_IsSupported", (PyCFunction) _wrap_DataObject_IsSupported, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_GetDataSize", (PyCFunction) _wrap_DataObject_GetDataSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_GetAllFormats", (PyCFunction) _wrap_DataObject_GetAllFormats, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_GetDataHere", (PyCFunction) _wrap_DataObject_GetDataHere, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_SetData", (PyCFunction) _wrap_DataObject_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObject_swigregister", DataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DataObjectSimple", (PyCFunction) _wrap_new_DataObjectSimple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectSimple_GetFormat", (PyCFunction) _wrap_DataObjectSimple_GetFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectSimple_SetFormat", (PyCFunction) _wrap_DataObjectSimple_SetFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectSimple_GetDataSize", (PyCFunction) _wrap_DataObjectSimple_GetDataSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectSimple_GetDataHere", (PyCFunction) _wrap_DataObjectSimple_GetDataHere, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectSimple_SetData", (PyCFunction) _wrap_DataObjectSimple_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectSimple_swigregister", DataObjectSimple_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyDataObjectSimple", (PyCFunction) _wrap_new_PyDataObjectSimple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDataObjectSimple__setCallbackInfo", (PyCFunction) _wrap_PyDataObjectSimple__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyDataObjectSimple_swigregister", PyDataObjectSimple_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DataObjectComposite", (PyCFunction) _wrap_new_DataObjectComposite, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDataObject_GetTextLength", (PyCFunction) _wrap_TextDataObject_GetTextLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDataObject_GetText", (PyCFunction) _wrap_TextDataObject_GetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDataObject_SetText", (PyCFunction) _wrap_TextDataObject_SetText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDataObject_swigregister", TextDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyTextDataObject", (PyCFunction) _wrap_new_PyTextDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextDataObject__setCallbackInfo", (PyCFunction) _wrap_PyTextDataObject__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyTextDataObject_swigregister", PyTextDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_BitmapDataObject", (PyCFunction) _wrap_new_BitmapDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapDataObject_GetBitmap", (PyCFunction) _wrap_BitmapDataObject_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapDataObject_SetBitmap", (PyCFunction) _wrap_BitmapDataObject_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"BitmapDataObject_swigregister", BitmapDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyBitmapDataObject", (PyCFunction) _wrap_new_PyBitmapDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapDataObject__setCallbackInfo", (PyCFunction) _wrap_PyBitmapDataObject__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyBitmapDataObject_swigregister", PyBitmapDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileDataObject", (PyCFunction) _wrap_new_FileDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDataObject_GetFilenames", (PyCFunction) _wrap_FileDataObject_GetFilenames, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDataObject_AddFile", (PyCFunction) _wrap_FileDataObject_AddFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDataObject_swigregister", FileDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CustomDataObject", (PyCFunction) _wrap_new_CustomDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CustomDataObject_SetData", (PyCFunction) _wrap_CustomDataObject_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CustomDataObject_GetSize", (PyCFunction) _wrap_CustomDataObject_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CustomDataObject_GetData", (PyCFunction) _wrap_CustomDataObject_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CustomDataObject_swigregister", CustomDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_URLDataObject", (PyCFunction) _wrap_new_URLDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"URLDataObject_GetURL", (PyCFunction) _wrap_URLDataObject_GetURL, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"URLDataObject_SetURL", (PyCFunction) _wrap_URLDataObject_SetURL, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"URLDataObject_swigregister", URLDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MetafileDataObject", (PyCFunction) _wrap_new_MetafileDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetafileDataObject_SetMetafile", (PyCFunction) _wrap_MetafileDataObject_SetMetafile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetafileDataObject_GetMetafile", (PyCFunction) _wrap_MetafileDataObject_GetMetafile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MetafileDataObject_swigregister", MetafileDataObject_swigregister, METH_VARARGS, NULL },
+        { (char *)"IsDragResultOk", (PyCFunction) _wrap_IsDragResultOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_DropSource", (PyCFunction) _wrap_new_DropSource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource__setCallbackInfo", (PyCFunction) _wrap_DropSource__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_DropSource", (PyCFunction) _wrap_delete_DropSource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource_SetData", (PyCFunction) _wrap_DropSource_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource_GetDataObject", (PyCFunction) _wrap_DropSource_GetDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource_SetCursor", (PyCFunction) _wrap_DropSource_SetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource_DoDragDrop", (PyCFunction) _wrap_DropSource_DoDragDrop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource_base_GiveFeedback", (PyCFunction) _wrap_DropSource_base_GiveFeedback, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropSource_swigregister", DropSource_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DropTarget", (PyCFunction) _wrap_new_DropTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget__setCallbackInfo", (PyCFunction) _wrap_DropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_DropTarget", (PyCFunction) _wrap_delete_DropTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_GetDataObject", (PyCFunction) _wrap_DropTarget_GetDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_SetDataObject", (PyCFunction) _wrap_DropTarget_SetDataObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_base_OnEnter", (PyCFunction) _wrap_DropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_base_OnDragOver", (PyCFunction) _wrap_DropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_base_OnLeave", (PyCFunction) _wrap_DropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_base_OnDrop", (PyCFunction) _wrap_DropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_GetData", (PyCFunction) _wrap_DropTarget_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DropTarget_swigregister", DropTarget_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TextDropTarget", (PyCFunction) _wrap_new_TextDropTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget__setCallbackInfo", (PyCFunction) _wrap_TextDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget_base_OnEnter", (PyCFunction) _wrap_TextDropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget_base_OnDragOver", (PyCFunction) _wrap_TextDropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget_base_OnLeave", (PyCFunction) _wrap_TextDropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget_base_OnDrop", (PyCFunction) _wrap_TextDropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget_base_OnData", (PyCFunction) _wrap_TextDropTarget_base_OnData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextDropTarget_swigregister", TextDropTarget_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileDropTarget", (PyCFunction) _wrap_new_FileDropTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget__setCallbackInfo", (PyCFunction) _wrap_FileDropTarget__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget_base_OnEnter", (PyCFunction) _wrap_FileDropTarget_base_OnEnter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget_base_OnDragOver", (PyCFunction) _wrap_FileDropTarget_base_OnDragOver, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget_base_OnLeave", (PyCFunction) _wrap_FileDropTarget_base_OnLeave, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget_base_OnDrop", (PyCFunction) _wrap_FileDropTarget_base_OnDrop, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget_base_OnData", (PyCFunction) _wrap_FileDropTarget_base_OnData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDropTarget_swigregister", FileDropTarget_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Clipboard", (PyCFunction) _wrap_new_Clipboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Clipboard", (PyCFunction) _wrap_delete_Clipboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_Open", (PyCFunction) _wrap_Clipboard_Open, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_Close", (PyCFunction) _wrap_Clipboard_Close, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_IsOpened", (PyCFunction) _wrap_Clipboard_IsOpened, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_AddData", (PyCFunction) _wrap_Clipboard_AddData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_SetData", (PyCFunction) _wrap_Clipboard_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_IsSupported", (PyCFunction) _wrap_Clipboard_IsSupported, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_GetData", (PyCFunction) _wrap_Clipboard_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_Clear", (PyCFunction) _wrap_Clipboard_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_Flush", (PyCFunction) _wrap_Clipboard_Flush, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_UsePrimarySelection", (PyCFunction) _wrap_Clipboard_UsePrimarySelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_Get", (PyCFunction) _wrap_Clipboard_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Clipboard_swigregister", Clipboard_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ClipboardLocker", (PyCFunction) _wrap_new_ClipboardLocker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ClipboardLocker", (PyCFunction) _wrap_delete_ClipboardLocker, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ClipboardLocker___nonzero__", (PyCFunction) _wrap_ClipboardLocker___nonzero__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ClipboardLocker_swigregister", ClipboardLocker_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_VideoMode", (PyCFunction) _wrap_new_VideoMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_VideoMode", (PyCFunction) _wrap_delete_VideoMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_Matches", (PyCFunction) _wrap_VideoMode_Matches, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_GetWidth", (PyCFunction) _wrap_VideoMode_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_GetHeight", (PyCFunction) _wrap_VideoMode_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_GetDepth", (PyCFunction) _wrap_VideoMode_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_IsOk", (PyCFunction) _wrap_VideoMode_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode___eq__", (PyCFunction) _wrap_VideoMode___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode___ne__", (PyCFunction) _wrap_VideoMode___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_w_set", (PyCFunction) _wrap_VideoMode_w_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_w_get", (PyCFunction) _wrap_VideoMode_w_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_h_set", (PyCFunction) _wrap_VideoMode_h_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_h_get", (PyCFunction) _wrap_VideoMode_h_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_bpp_set", (PyCFunction) _wrap_VideoMode_bpp_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_bpp_get", (PyCFunction) _wrap_VideoMode_bpp_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_refresh_set", (PyCFunction) _wrap_VideoMode_refresh_set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_refresh_get", (PyCFunction) _wrap_VideoMode_refresh_get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VideoMode_swigregister", VideoMode_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Display", (PyCFunction) _wrap_new_Display, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Display", (PyCFunction) _wrap_delete_Display, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetCount", (PyCFunction) _wrap_Display_GetCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetFromPoint", (PyCFunction) _wrap_Display_GetFromPoint, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetFromWindow", (PyCFunction) _wrap_Display_GetFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_IsOk", (PyCFunction) _wrap_Display_IsOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetGeometry", (PyCFunction) _wrap_Display_GetGeometry, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetName", (PyCFunction) _wrap_Display_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_IsPrimary", (PyCFunction) _wrap_Display_IsPrimary, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetModes", (PyCFunction) _wrap_Display_GetModes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_GetCurrentMode", (PyCFunction) _wrap_Display_GetCurrentMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_ChangeMode", (PyCFunction) _wrap_Display_ChangeMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_ResetMode", (PyCFunction) _wrap_Display_ResetMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Display_swigregister", Display_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -29894,7 +30018,7 @@ static swig_const_info swig_const_table[] = {
 { SWIG_PY_POINTER, (char*)"TRACE_ResAlloc", 0, 0, (void *)"resalloc", &SWIGTYPE_p_char},
 { SWIG_PY_POINTER, (char*)"TRACE_RefCount", 0, 0, (void *)"refcount", &SWIGTYPE_p_char},
 { SWIG_PY_POINTER, (char*)"TRACE_OleCalls", 0, 0, (void *)"ole", &SWIGTYPE_p_char},
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -29920,181 +30044,181 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
-    PyDict_SetItemString(d,"SYS_OEM_FIXED_FONT", SWIG_FromInt((int)wxSYS_OEM_FIXED_FONT));
-    PyDict_SetItemString(d,"SYS_ANSI_FIXED_FONT", SWIG_FromInt((int)wxSYS_ANSI_FIXED_FONT));
-    PyDict_SetItemString(d,"SYS_ANSI_VAR_FONT", SWIG_FromInt((int)wxSYS_ANSI_VAR_FONT));
-    PyDict_SetItemString(d,"SYS_SYSTEM_FONT", SWIG_FromInt((int)wxSYS_SYSTEM_FONT));
-    PyDict_SetItemString(d,"SYS_DEVICE_DEFAULT_FONT", SWIG_FromInt((int)wxSYS_DEVICE_DEFAULT_FONT));
-    PyDict_SetItemString(d,"SYS_DEFAULT_PALETTE", SWIG_FromInt((int)wxSYS_DEFAULT_PALETTE));
-    PyDict_SetItemString(d,"SYS_SYSTEM_FIXED_FONT", SWIG_FromInt((int)wxSYS_SYSTEM_FIXED_FONT));
-    PyDict_SetItemString(d,"SYS_DEFAULT_GUI_FONT", SWIG_FromInt((int)wxSYS_DEFAULT_GUI_FONT));
-    PyDict_SetItemString(d,"SYS_ICONTITLE_FONT", SWIG_FromInt((int)wxSYS_ICONTITLE_FONT));
-    PyDict_SetItemString(d,"SYS_COLOUR_SCROLLBAR", SWIG_FromInt((int)wxSYS_COLOUR_SCROLLBAR));
-    PyDict_SetItemString(d,"SYS_COLOUR_BACKGROUND", SWIG_FromInt((int)wxSYS_COLOUR_BACKGROUND));
-    PyDict_SetItemString(d,"SYS_COLOUR_DESKTOP", SWIG_FromInt((int)wxSYS_COLOUR_DESKTOP));
-    PyDict_SetItemString(d,"SYS_COLOUR_ACTIVECAPTION", SWIG_FromInt((int)wxSYS_COLOUR_ACTIVECAPTION));
-    PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTION", SWIG_FromInt((int)wxSYS_COLOUR_INACTIVECAPTION));
-    PyDict_SetItemString(d,"SYS_COLOUR_MENU", SWIG_FromInt((int)wxSYS_COLOUR_MENU));
-    PyDict_SetItemString(d,"SYS_COLOUR_WINDOW", SWIG_FromInt((int)wxSYS_COLOUR_WINDOW));
-    PyDict_SetItemString(d,"SYS_COLOUR_WINDOWFRAME", SWIG_FromInt((int)wxSYS_COLOUR_WINDOWFRAME));
-    PyDict_SetItemString(d,"SYS_COLOUR_MENUTEXT", SWIG_FromInt((int)wxSYS_COLOUR_MENUTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_WINDOWTEXT", SWIG_FromInt((int)wxSYS_COLOUR_WINDOWTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_CAPTIONTEXT", SWIG_FromInt((int)wxSYS_COLOUR_CAPTIONTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_ACTIVEBORDER", SWIG_FromInt((int)wxSYS_COLOUR_ACTIVEBORDER));
-    PyDict_SetItemString(d,"SYS_COLOUR_INACTIVEBORDER", SWIG_FromInt((int)wxSYS_COLOUR_INACTIVEBORDER));
-    PyDict_SetItemString(d,"SYS_COLOUR_APPWORKSPACE", SWIG_FromInt((int)wxSYS_COLOUR_APPWORKSPACE));
-    PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHT", SWIG_FromInt((int)wxSYS_COLOUR_HIGHLIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHTTEXT", SWIG_FromInt((int)wxSYS_COLOUR_HIGHLIGHTTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_BTNFACE", SWIG_FromInt((int)wxSYS_COLOUR_BTNFACE));
-    PyDict_SetItemString(d,"SYS_COLOUR_3DFACE", SWIG_FromInt((int)wxSYS_COLOUR_3DFACE));
-    PyDict_SetItemString(d,"SYS_COLOUR_BTNSHADOW", SWIG_FromInt((int)wxSYS_COLOUR_BTNSHADOW));
-    PyDict_SetItemString(d,"SYS_COLOUR_3DSHADOW", SWIG_FromInt((int)wxSYS_COLOUR_3DSHADOW));
-    PyDict_SetItemString(d,"SYS_COLOUR_GRAYTEXT", SWIG_FromInt((int)wxSYS_COLOUR_GRAYTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_BTNTEXT", SWIG_FromInt((int)wxSYS_COLOUR_BTNTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTIONTEXT", SWIG_FromInt((int)wxSYS_COLOUR_INACTIVECAPTIONTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_BTNHIGHLIGHT", SWIG_FromInt((int)wxSYS_COLOUR_BTNHIGHLIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_BTNHILIGHT", SWIG_FromInt((int)wxSYS_COLOUR_BTNHILIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_3DHIGHLIGHT", SWIG_FromInt((int)wxSYS_COLOUR_3DHIGHLIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_3DHILIGHT", SWIG_FromInt((int)wxSYS_COLOUR_3DHILIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_3DDKSHADOW", SWIG_FromInt((int)wxSYS_COLOUR_3DDKSHADOW));
-    PyDict_SetItemString(d,"SYS_COLOUR_3DLIGHT", SWIG_FromInt((int)wxSYS_COLOUR_3DLIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_INFOTEXT", SWIG_FromInt((int)wxSYS_COLOUR_INFOTEXT));
-    PyDict_SetItemString(d,"SYS_COLOUR_INFOBK", SWIG_FromInt((int)wxSYS_COLOUR_INFOBK));
-    PyDict_SetItemString(d,"SYS_COLOUR_LISTBOX", SWIG_FromInt((int)wxSYS_COLOUR_LISTBOX));
-    PyDict_SetItemString(d,"SYS_COLOUR_HOTLIGHT", SWIG_FromInt((int)wxSYS_COLOUR_HOTLIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTACTIVECAPTION", SWIG_FromInt((int)wxSYS_COLOUR_GRADIENTACTIVECAPTION));
-    PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTINACTIVECAPTION", SWIG_FromInt((int)wxSYS_COLOUR_GRADIENTINACTIVECAPTION));
-    PyDict_SetItemString(d,"SYS_COLOUR_MENUHILIGHT", SWIG_FromInt((int)wxSYS_COLOUR_MENUHILIGHT));
-    PyDict_SetItemString(d,"SYS_COLOUR_MENUBAR", SWIG_FromInt((int)wxSYS_COLOUR_MENUBAR));
-    PyDict_SetItemString(d,"SYS_COLOUR_MAX", SWIG_FromInt((int)wxSYS_COLOUR_MAX));
-    PyDict_SetItemString(d,"SYS_MOUSE_BUTTONS", SWIG_FromInt((int)wxSYS_MOUSE_BUTTONS));
-    PyDict_SetItemString(d,"SYS_BORDER_X", SWIG_FromInt((int)wxSYS_BORDER_X));
-    PyDict_SetItemString(d,"SYS_BORDER_Y", SWIG_FromInt((int)wxSYS_BORDER_Y));
-    PyDict_SetItemString(d,"SYS_CURSOR_X", SWIG_FromInt((int)wxSYS_CURSOR_X));
-    PyDict_SetItemString(d,"SYS_CURSOR_Y", SWIG_FromInt((int)wxSYS_CURSOR_Y));
-    PyDict_SetItemString(d,"SYS_DCLICK_X", SWIG_FromInt((int)wxSYS_DCLICK_X));
-    PyDict_SetItemString(d,"SYS_DCLICK_Y", SWIG_FromInt((int)wxSYS_DCLICK_Y));
-    PyDict_SetItemString(d,"SYS_DRAG_X", SWIG_FromInt((int)wxSYS_DRAG_X));
-    PyDict_SetItemString(d,"SYS_DRAG_Y", SWIG_FromInt((int)wxSYS_DRAG_Y));
-    PyDict_SetItemString(d,"SYS_EDGE_X", SWIG_FromInt((int)wxSYS_EDGE_X));
-    PyDict_SetItemString(d,"SYS_EDGE_Y", SWIG_FromInt((int)wxSYS_EDGE_Y));
-    PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_X", SWIG_FromInt((int)wxSYS_HSCROLL_ARROW_X));
-    PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_Y", SWIG_FromInt((int)wxSYS_HSCROLL_ARROW_Y));
-    PyDict_SetItemString(d,"SYS_HTHUMB_X", SWIG_FromInt((int)wxSYS_HTHUMB_X));
-    PyDict_SetItemString(d,"SYS_ICON_X", SWIG_FromInt((int)wxSYS_ICON_X));
-    PyDict_SetItemString(d,"SYS_ICON_Y", SWIG_FromInt((int)wxSYS_ICON_Y));
-    PyDict_SetItemString(d,"SYS_ICONSPACING_X", SWIG_FromInt((int)wxSYS_ICONSPACING_X));
-    PyDict_SetItemString(d,"SYS_ICONSPACING_Y", SWIG_FromInt((int)wxSYS_ICONSPACING_Y));
-    PyDict_SetItemString(d,"SYS_WINDOWMIN_X", SWIG_FromInt((int)wxSYS_WINDOWMIN_X));
-    PyDict_SetItemString(d,"SYS_WINDOWMIN_Y", SWIG_FromInt((int)wxSYS_WINDOWMIN_Y));
-    PyDict_SetItemString(d,"SYS_SCREEN_X", SWIG_FromInt((int)wxSYS_SCREEN_X));
-    PyDict_SetItemString(d,"SYS_SCREEN_Y", SWIG_FromInt((int)wxSYS_SCREEN_Y));
-    PyDict_SetItemString(d,"SYS_FRAMESIZE_X", SWIG_FromInt((int)wxSYS_FRAMESIZE_X));
-    PyDict_SetItemString(d,"SYS_FRAMESIZE_Y", SWIG_FromInt((int)wxSYS_FRAMESIZE_Y));
-    PyDict_SetItemString(d,"SYS_SMALLICON_X", SWIG_FromInt((int)wxSYS_SMALLICON_X));
-    PyDict_SetItemString(d,"SYS_SMALLICON_Y", SWIG_FromInt((int)wxSYS_SMALLICON_Y));
-    PyDict_SetItemString(d,"SYS_HSCROLL_Y", SWIG_FromInt((int)wxSYS_HSCROLL_Y));
-    PyDict_SetItemString(d,"SYS_VSCROLL_X", SWIG_FromInt((int)wxSYS_VSCROLL_X));
-    PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_X", SWIG_FromInt((int)wxSYS_VSCROLL_ARROW_X));
-    PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_Y", SWIG_FromInt((int)wxSYS_VSCROLL_ARROW_Y));
-    PyDict_SetItemString(d,"SYS_VTHUMB_Y", SWIG_FromInt((int)wxSYS_VTHUMB_Y));
-    PyDict_SetItemString(d,"SYS_CAPTION_Y", SWIG_FromInt((int)wxSYS_CAPTION_Y));
-    PyDict_SetItemString(d,"SYS_MENU_Y", SWIG_FromInt((int)wxSYS_MENU_Y));
-    PyDict_SetItemString(d,"SYS_NETWORK_PRESENT", SWIG_FromInt((int)wxSYS_NETWORK_PRESENT));
-    PyDict_SetItemString(d,"SYS_PENWINDOWS_PRESENT", SWIG_FromInt((int)wxSYS_PENWINDOWS_PRESENT));
-    PyDict_SetItemString(d,"SYS_SHOW_SOUNDS", SWIG_FromInt((int)wxSYS_SHOW_SOUNDS));
-    PyDict_SetItemString(d,"SYS_SWAP_BUTTONS", SWIG_FromInt((int)wxSYS_SWAP_BUTTONS));
-    PyDict_SetItemString(d,"SYS_CAN_DRAW_FRAME_DECORATIONS", SWIG_FromInt((int)wxSYS_CAN_DRAW_FRAME_DECORATIONS));
-    PyDict_SetItemString(d,"SYS_CAN_ICONIZE_FRAME", SWIG_FromInt((int)wxSYS_CAN_ICONIZE_FRAME));
-    PyDict_SetItemString(d,"SYS_SCREEN_NONE", SWIG_FromInt((int)wxSYS_SCREEN_NONE));
-    PyDict_SetItemString(d,"SYS_SCREEN_TINY", SWIG_FromInt((int)wxSYS_SCREEN_TINY));
-    PyDict_SetItemString(d,"SYS_SCREEN_PDA", SWIG_FromInt((int)wxSYS_SCREEN_PDA));
-    PyDict_SetItemString(d,"SYS_SCREEN_SMALL", SWIG_FromInt((int)wxSYS_SCREEN_SMALL));
-    PyDict_SetItemString(d,"SYS_SCREEN_DESKTOP", SWIG_FromInt((int)wxSYS_SCREEN_DESKTOP));
+    PyDict_SetItemString(d,"SYS_OEM_FIXED_FONT", SWIG_From_int((int)wxSYS_OEM_FIXED_FONT));
+    PyDict_SetItemString(d,"SYS_ANSI_FIXED_FONT", SWIG_From_int((int)wxSYS_ANSI_FIXED_FONT));
+    PyDict_SetItemString(d,"SYS_ANSI_VAR_FONT", SWIG_From_int((int)wxSYS_ANSI_VAR_FONT));
+    PyDict_SetItemString(d,"SYS_SYSTEM_FONT", SWIG_From_int((int)wxSYS_SYSTEM_FONT));
+    PyDict_SetItemString(d,"SYS_DEVICE_DEFAULT_FONT", SWIG_From_int((int)wxSYS_DEVICE_DEFAULT_FONT));
+    PyDict_SetItemString(d,"SYS_DEFAULT_PALETTE", SWIG_From_int((int)wxSYS_DEFAULT_PALETTE));
+    PyDict_SetItemString(d,"SYS_SYSTEM_FIXED_FONT", SWIG_From_int((int)wxSYS_SYSTEM_FIXED_FONT));
+    PyDict_SetItemString(d,"SYS_DEFAULT_GUI_FONT", SWIG_From_int((int)wxSYS_DEFAULT_GUI_FONT));
+    PyDict_SetItemString(d,"SYS_ICONTITLE_FONT", SWIG_From_int((int)wxSYS_ICONTITLE_FONT));
+    PyDict_SetItemString(d,"SYS_COLOUR_SCROLLBAR", SWIG_From_int((int)wxSYS_COLOUR_SCROLLBAR));
+    PyDict_SetItemString(d,"SYS_COLOUR_BACKGROUND", SWIG_From_int((int)wxSYS_COLOUR_BACKGROUND));
+    PyDict_SetItemString(d,"SYS_COLOUR_DESKTOP", SWIG_From_int((int)wxSYS_COLOUR_DESKTOP));
+    PyDict_SetItemString(d,"SYS_COLOUR_ACTIVECAPTION", SWIG_From_int((int)wxSYS_COLOUR_ACTIVECAPTION));
+    PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTION", SWIG_From_int((int)wxSYS_COLOUR_INACTIVECAPTION));
+    PyDict_SetItemString(d,"SYS_COLOUR_MENU", SWIG_From_int((int)wxSYS_COLOUR_MENU));
+    PyDict_SetItemString(d,"SYS_COLOUR_WINDOW", SWIG_From_int((int)wxSYS_COLOUR_WINDOW));
+    PyDict_SetItemString(d,"SYS_COLOUR_WINDOWFRAME", SWIG_From_int((int)wxSYS_COLOUR_WINDOWFRAME));
+    PyDict_SetItemString(d,"SYS_COLOUR_MENUTEXT", SWIG_From_int((int)wxSYS_COLOUR_MENUTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_WINDOWTEXT", SWIG_From_int((int)wxSYS_COLOUR_WINDOWTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_CAPTIONTEXT", SWIG_From_int((int)wxSYS_COLOUR_CAPTIONTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_ACTIVEBORDER", SWIG_From_int((int)wxSYS_COLOUR_ACTIVEBORDER));
+    PyDict_SetItemString(d,"SYS_COLOUR_INACTIVEBORDER", SWIG_From_int((int)wxSYS_COLOUR_INACTIVEBORDER));
+    PyDict_SetItemString(d,"SYS_COLOUR_APPWORKSPACE", SWIG_From_int((int)wxSYS_COLOUR_APPWORKSPACE));
+    PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHT", SWIG_From_int((int)wxSYS_COLOUR_HIGHLIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_HIGHLIGHTTEXT", SWIG_From_int((int)wxSYS_COLOUR_HIGHLIGHTTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_BTNFACE", SWIG_From_int((int)wxSYS_COLOUR_BTNFACE));
+    PyDict_SetItemString(d,"SYS_COLOUR_3DFACE", SWIG_From_int((int)wxSYS_COLOUR_3DFACE));
+    PyDict_SetItemString(d,"SYS_COLOUR_BTNSHADOW", SWIG_From_int((int)wxSYS_COLOUR_BTNSHADOW));
+    PyDict_SetItemString(d,"SYS_COLOUR_3DSHADOW", SWIG_From_int((int)wxSYS_COLOUR_3DSHADOW));
+    PyDict_SetItemString(d,"SYS_COLOUR_GRAYTEXT", SWIG_From_int((int)wxSYS_COLOUR_GRAYTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_BTNTEXT", SWIG_From_int((int)wxSYS_COLOUR_BTNTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_INACTIVECAPTIONTEXT", SWIG_From_int((int)wxSYS_COLOUR_INACTIVECAPTIONTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_BTNHIGHLIGHT", SWIG_From_int((int)wxSYS_COLOUR_BTNHIGHLIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_BTNHILIGHT", SWIG_From_int((int)wxSYS_COLOUR_BTNHILIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_3DHIGHLIGHT", SWIG_From_int((int)wxSYS_COLOUR_3DHIGHLIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_3DHILIGHT", SWIG_From_int((int)wxSYS_COLOUR_3DHILIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_3DDKSHADOW", SWIG_From_int((int)wxSYS_COLOUR_3DDKSHADOW));
+    PyDict_SetItemString(d,"SYS_COLOUR_3DLIGHT", SWIG_From_int((int)wxSYS_COLOUR_3DLIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_INFOTEXT", SWIG_From_int((int)wxSYS_COLOUR_INFOTEXT));
+    PyDict_SetItemString(d,"SYS_COLOUR_INFOBK", SWIG_From_int((int)wxSYS_COLOUR_INFOBK));
+    PyDict_SetItemString(d,"SYS_COLOUR_LISTBOX", SWIG_From_int((int)wxSYS_COLOUR_LISTBOX));
+    PyDict_SetItemString(d,"SYS_COLOUR_HOTLIGHT", SWIG_From_int((int)wxSYS_COLOUR_HOTLIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTACTIVECAPTION", SWIG_From_int((int)wxSYS_COLOUR_GRADIENTACTIVECAPTION));
+    PyDict_SetItemString(d,"SYS_COLOUR_GRADIENTINACTIVECAPTION", SWIG_From_int((int)wxSYS_COLOUR_GRADIENTINACTIVECAPTION));
+    PyDict_SetItemString(d,"SYS_COLOUR_MENUHILIGHT", SWIG_From_int((int)wxSYS_COLOUR_MENUHILIGHT));
+    PyDict_SetItemString(d,"SYS_COLOUR_MENUBAR", SWIG_From_int((int)wxSYS_COLOUR_MENUBAR));
+    PyDict_SetItemString(d,"SYS_COLOUR_MAX", SWIG_From_int((int)wxSYS_COLOUR_MAX));
+    PyDict_SetItemString(d,"SYS_MOUSE_BUTTONS", SWIG_From_int((int)wxSYS_MOUSE_BUTTONS));
+    PyDict_SetItemString(d,"SYS_BORDER_X", SWIG_From_int((int)wxSYS_BORDER_X));
+    PyDict_SetItemString(d,"SYS_BORDER_Y", SWIG_From_int((int)wxSYS_BORDER_Y));
+    PyDict_SetItemString(d,"SYS_CURSOR_X", SWIG_From_int((int)wxSYS_CURSOR_X));
+    PyDict_SetItemString(d,"SYS_CURSOR_Y", SWIG_From_int((int)wxSYS_CURSOR_Y));
+    PyDict_SetItemString(d,"SYS_DCLICK_X", SWIG_From_int((int)wxSYS_DCLICK_X));
+    PyDict_SetItemString(d,"SYS_DCLICK_Y", SWIG_From_int((int)wxSYS_DCLICK_Y));
+    PyDict_SetItemString(d,"SYS_DRAG_X", SWIG_From_int((int)wxSYS_DRAG_X));
+    PyDict_SetItemString(d,"SYS_DRAG_Y", SWIG_From_int((int)wxSYS_DRAG_Y));
+    PyDict_SetItemString(d,"SYS_EDGE_X", SWIG_From_int((int)wxSYS_EDGE_X));
+    PyDict_SetItemString(d,"SYS_EDGE_Y", SWIG_From_int((int)wxSYS_EDGE_Y));
+    PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_X", SWIG_From_int((int)wxSYS_HSCROLL_ARROW_X));
+    PyDict_SetItemString(d,"SYS_HSCROLL_ARROW_Y", SWIG_From_int((int)wxSYS_HSCROLL_ARROW_Y));
+    PyDict_SetItemString(d,"SYS_HTHUMB_X", SWIG_From_int((int)wxSYS_HTHUMB_X));
+    PyDict_SetItemString(d,"SYS_ICON_X", SWIG_From_int((int)wxSYS_ICON_X));
+    PyDict_SetItemString(d,"SYS_ICON_Y", SWIG_From_int((int)wxSYS_ICON_Y));
+    PyDict_SetItemString(d,"SYS_ICONSPACING_X", SWIG_From_int((int)wxSYS_ICONSPACING_X));
+    PyDict_SetItemString(d,"SYS_ICONSPACING_Y", SWIG_From_int((int)wxSYS_ICONSPACING_Y));
+    PyDict_SetItemString(d,"SYS_WINDOWMIN_X", SWIG_From_int((int)wxSYS_WINDOWMIN_X));
+    PyDict_SetItemString(d,"SYS_WINDOWMIN_Y", SWIG_From_int((int)wxSYS_WINDOWMIN_Y));
+    PyDict_SetItemString(d,"SYS_SCREEN_X", SWIG_From_int((int)wxSYS_SCREEN_X));
+    PyDict_SetItemString(d,"SYS_SCREEN_Y", SWIG_From_int((int)wxSYS_SCREEN_Y));
+    PyDict_SetItemString(d,"SYS_FRAMESIZE_X", SWIG_From_int((int)wxSYS_FRAMESIZE_X));
+    PyDict_SetItemString(d,"SYS_FRAMESIZE_Y", SWIG_From_int((int)wxSYS_FRAMESIZE_Y));
+    PyDict_SetItemString(d,"SYS_SMALLICON_X", SWIG_From_int((int)wxSYS_SMALLICON_X));
+    PyDict_SetItemString(d,"SYS_SMALLICON_Y", SWIG_From_int((int)wxSYS_SMALLICON_Y));
+    PyDict_SetItemString(d,"SYS_HSCROLL_Y", SWIG_From_int((int)wxSYS_HSCROLL_Y));
+    PyDict_SetItemString(d,"SYS_VSCROLL_X", SWIG_From_int((int)wxSYS_VSCROLL_X));
+    PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_X", SWIG_From_int((int)wxSYS_VSCROLL_ARROW_X));
+    PyDict_SetItemString(d,"SYS_VSCROLL_ARROW_Y", SWIG_From_int((int)wxSYS_VSCROLL_ARROW_Y));
+    PyDict_SetItemString(d,"SYS_VTHUMB_Y", SWIG_From_int((int)wxSYS_VTHUMB_Y));
+    PyDict_SetItemString(d,"SYS_CAPTION_Y", SWIG_From_int((int)wxSYS_CAPTION_Y));
+    PyDict_SetItemString(d,"SYS_MENU_Y", SWIG_From_int((int)wxSYS_MENU_Y));
+    PyDict_SetItemString(d,"SYS_NETWORK_PRESENT", SWIG_From_int((int)wxSYS_NETWORK_PRESENT));
+    PyDict_SetItemString(d,"SYS_PENWINDOWS_PRESENT", SWIG_From_int((int)wxSYS_PENWINDOWS_PRESENT));
+    PyDict_SetItemString(d,"SYS_SHOW_SOUNDS", SWIG_From_int((int)wxSYS_SHOW_SOUNDS));
+    PyDict_SetItemString(d,"SYS_SWAP_BUTTONS", SWIG_From_int((int)wxSYS_SWAP_BUTTONS));
+    PyDict_SetItemString(d,"SYS_CAN_DRAW_FRAME_DECORATIONS", SWIG_From_int((int)wxSYS_CAN_DRAW_FRAME_DECORATIONS));
+    PyDict_SetItemString(d,"SYS_CAN_ICONIZE_FRAME", SWIG_From_int((int)wxSYS_CAN_ICONIZE_FRAME));
+    PyDict_SetItemString(d,"SYS_SCREEN_NONE", SWIG_From_int((int)wxSYS_SCREEN_NONE));
+    PyDict_SetItemString(d,"SYS_SCREEN_TINY", SWIG_From_int((int)wxSYS_SCREEN_TINY));
+    PyDict_SetItemString(d,"SYS_SCREEN_PDA", SWIG_From_int((int)wxSYS_SCREEN_PDA));
+    PyDict_SetItemString(d,"SYS_SCREEN_SMALL", SWIG_From_int((int)wxSYS_SCREEN_SMALL));
+    PyDict_SetItemString(d,"SYS_SCREEN_DESKTOP", SWIG_From_int((int)wxSYS_SCREEN_DESKTOP));
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorPromptStr",_wrap_FileSelectorPromptStr_get, _wrap_FileSelectorPromptStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"DirSelectorPromptStr",_wrap_DirSelectorPromptStr_get, _wrap_DirSelectorPromptStr_set);
-    PyDict_SetItemString(d,"SHUTDOWN_POWEROFF", SWIG_FromInt((int)wxSHUTDOWN_POWEROFF));
-    PyDict_SetItemString(d,"SHUTDOWN_REBOOT", SWIG_FromInt((int)wxSHUTDOWN_REBOOT));
-    PyDict_SetItemString(d,"TIMER_CONTINUOUS", SWIG_FromInt((int)wxTIMER_CONTINUOUS));
-    PyDict_SetItemString(d,"TIMER_ONE_SHOT", SWIG_FromInt((int)wxTIMER_ONE_SHOT));
+    PyDict_SetItemString(d,"SHUTDOWN_POWEROFF", SWIG_From_int((int)wxSHUTDOWN_POWEROFF));
+    PyDict_SetItemString(d,"SHUTDOWN_REBOOT", SWIG_From_int((int)wxSHUTDOWN_REBOOT));
+    PyDict_SetItemString(d,"TIMER_CONTINUOUS", SWIG_From_int((int)wxTIMER_CONTINUOUS));
+    PyDict_SetItemString(d,"TIMER_ONE_SHOT", SWIG_From_int((int)wxTIMER_ONE_SHOT));
     PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER));
     
     wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer");
     
-    PyDict_SetItemString(d,"LOG_FatalError", SWIG_FromInt((int)wxLOG_FatalError));
-    PyDict_SetItemString(d,"LOG_Error", SWIG_FromInt((int)wxLOG_Error));
-    PyDict_SetItemString(d,"LOG_Warning", SWIG_FromInt((int)wxLOG_Warning));
-    PyDict_SetItemString(d,"LOG_Message", SWIG_FromInt((int)wxLOG_Message));
-    PyDict_SetItemString(d,"LOG_Status", SWIG_FromInt((int)wxLOG_Status));
-    PyDict_SetItemString(d,"LOG_Info", SWIG_FromInt((int)wxLOG_Info));
-    PyDict_SetItemString(d,"LOG_Debug", SWIG_FromInt((int)wxLOG_Debug));
-    PyDict_SetItemString(d,"LOG_Trace", SWIG_FromInt((int)wxLOG_Trace));
-    PyDict_SetItemString(d,"LOG_Progress", SWIG_FromInt((int)wxLOG_Progress));
-    PyDict_SetItemString(d,"LOG_User", SWIG_FromInt((int)wxLOG_User));
-    PyDict_SetItemString(d,"LOG_Max", SWIG_FromInt((int)wxLOG_Max));
+    PyDict_SetItemString(d,"LOG_FatalError", SWIG_From_int((int)wxLOG_FatalError));
+    PyDict_SetItemString(d,"LOG_Error", SWIG_From_int((int)wxLOG_Error));
+    PyDict_SetItemString(d,"LOG_Warning", SWIG_From_int((int)wxLOG_Warning));
+    PyDict_SetItemString(d,"LOG_Message", SWIG_From_int((int)wxLOG_Message));
+    PyDict_SetItemString(d,"LOG_Status", SWIG_From_int((int)wxLOG_Status));
+    PyDict_SetItemString(d,"LOG_Info", SWIG_From_int((int)wxLOG_Info));
+    PyDict_SetItemString(d,"LOG_Debug", SWIG_From_int((int)wxLOG_Debug));
+    PyDict_SetItemString(d,"LOG_Trace", SWIG_From_int((int)wxLOG_Trace));
+    PyDict_SetItemString(d,"LOG_Progress", SWIG_From_int((int)wxLOG_Progress));
+    PyDict_SetItemString(d,"LOG_User", SWIG_From_int((int)wxLOG_User));
+    PyDict_SetItemString(d,"LOG_Max", SWIG_From_int((int)wxLOG_Max));
     PyDict_SetItemString(d,"TRACE_MemAlloc", SWIG_FromCharPtr("memalloc"));
     PyDict_SetItemString(d,"TRACE_Messages", SWIG_FromCharPtr("messages"));
     PyDict_SetItemString(d,"TRACE_ResAlloc", SWIG_FromCharPtr("resalloc"));
     PyDict_SetItemString(d,"TRACE_RefCount", SWIG_FromCharPtr("refcount"));
     PyDict_SetItemString(d,"TRACE_OleCalls", SWIG_FromCharPtr("ole"));
-    PyDict_SetItemString(d,"TraceMemAlloc", SWIG_FromInt((int)0x0001));
-    PyDict_SetItemString(d,"TraceMessages", SWIG_FromInt((int)0x0002));
-    PyDict_SetItemString(d,"TraceResAlloc", SWIG_FromInt((int)0x0004));
-    PyDict_SetItemString(d,"TraceRefCount", SWIG_FromInt((int)0x0008));
-    PyDict_SetItemString(d,"TraceOleCalls", SWIG_FromInt((int)0x0100));
-    PyDict_SetItemString(d,"PROCESS_DEFAULT", SWIG_FromInt((int)wxPROCESS_DEFAULT));
-    PyDict_SetItemString(d,"PROCESS_REDIRECT", SWIG_FromInt((int)wxPROCESS_REDIRECT));
-    PyDict_SetItemString(d,"KILL_OK", SWIG_FromInt((int)wxKILL_OK));
-    PyDict_SetItemString(d,"KILL_BAD_SIGNAL", SWIG_FromInt((int)wxKILL_BAD_SIGNAL));
-    PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_FromInt((int)wxKILL_ACCESS_DENIED));
-    PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_FromInt((int)wxKILL_NO_PROCESS));
-    PyDict_SetItemString(d,"KILL_ERROR", SWIG_FromInt((int)wxKILL_ERROR));
-    PyDict_SetItemString(d,"SIGNONE", SWIG_FromInt((int)wxSIGNONE));
-    PyDict_SetItemString(d,"SIGHUP", SWIG_FromInt((int)wxSIGHUP));
-    PyDict_SetItemString(d,"SIGINT", SWIG_FromInt((int)wxSIGINT));
-    PyDict_SetItemString(d,"SIGQUIT", SWIG_FromInt((int)wxSIGQUIT));
-    PyDict_SetItemString(d,"SIGILL", SWIG_FromInt((int)wxSIGILL));
-    PyDict_SetItemString(d,"SIGTRAP", SWIG_FromInt((int)wxSIGTRAP));
-    PyDict_SetItemString(d,"SIGABRT", SWIG_FromInt((int)wxSIGABRT));
-    PyDict_SetItemString(d,"SIGIOT", SWIG_FromInt((int)wxSIGIOT));
-    PyDict_SetItemString(d,"SIGEMT", SWIG_FromInt((int)wxSIGEMT));
-    PyDict_SetItemString(d,"SIGFPE", SWIG_FromInt((int)wxSIGFPE));
-    PyDict_SetItemString(d,"SIGKILL", SWIG_FromInt((int)wxSIGKILL));
-    PyDict_SetItemString(d,"SIGBUS", SWIG_FromInt((int)wxSIGBUS));
-    PyDict_SetItemString(d,"SIGSEGV", SWIG_FromInt((int)wxSIGSEGV));
-    PyDict_SetItemString(d,"SIGSYS", SWIG_FromInt((int)wxSIGSYS));
-    PyDict_SetItemString(d,"SIGPIPE", SWIG_FromInt((int)wxSIGPIPE));
-    PyDict_SetItemString(d,"SIGALRM", SWIG_FromInt((int)wxSIGALRM));
-    PyDict_SetItemString(d,"SIGTERM", SWIG_FromInt((int)wxSIGTERM));
+    PyDict_SetItemString(d,"TraceMemAlloc", SWIG_From_int((int)0x0001));
+    PyDict_SetItemString(d,"TraceMessages", SWIG_From_int((int)0x0002));
+    PyDict_SetItemString(d,"TraceResAlloc", SWIG_From_int((int)0x0004));
+    PyDict_SetItemString(d,"TraceRefCount", SWIG_From_int((int)0x0008));
+    PyDict_SetItemString(d,"TraceOleCalls", SWIG_From_int((int)0x0100));
+    PyDict_SetItemString(d,"PROCESS_DEFAULT", SWIG_From_int((int)wxPROCESS_DEFAULT));
+    PyDict_SetItemString(d,"PROCESS_REDIRECT", SWIG_From_int((int)wxPROCESS_REDIRECT));
+    PyDict_SetItemString(d,"KILL_OK", SWIG_From_int((int)wxKILL_OK));
+    PyDict_SetItemString(d,"KILL_BAD_SIGNAL", SWIG_From_int((int)wxKILL_BAD_SIGNAL));
+    PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_From_int((int)wxKILL_ACCESS_DENIED));
+    PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_From_int((int)wxKILL_NO_PROCESS));
+    PyDict_SetItemString(d,"KILL_ERROR", SWIG_From_int((int)wxKILL_ERROR));
+    PyDict_SetItemString(d,"SIGNONE", SWIG_From_int((int)wxSIGNONE));
+    PyDict_SetItemString(d,"SIGHUP", SWIG_From_int((int)wxSIGHUP));
+    PyDict_SetItemString(d,"SIGINT", SWIG_From_int((int)wxSIGINT));
+    PyDict_SetItemString(d,"SIGQUIT", SWIG_From_int((int)wxSIGQUIT));
+    PyDict_SetItemString(d,"SIGILL", SWIG_From_int((int)wxSIGILL));
+    PyDict_SetItemString(d,"SIGTRAP", SWIG_From_int((int)wxSIGTRAP));
+    PyDict_SetItemString(d,"SIGABRT", SWIG_From_int((int)wxSIGABRT));
+    PyDict_SetItemString(d,"SIGIOT", SWIG_From_int((int)wxSIGIOT));
+    PyDict_SetItemString(d,"SIGEMT", SWIG_From_int((int)wxSIGEMT));
+    PyDict_SetItemString(d,"SIGFPE", SWIG_From_int((int)wxSIGFPE));
+    PyDict_SetItemString(d,"SIGKILL", SWIG_From_int((int)wxSIGKILL));
+    PyDict_SetItemString(d,"SIGBUS", SWIG_From_int((int)wxSIGBUS));
+    PyDict_SetItemString(d,"SIGSEGV", SWIG_From_int((int)wxSIGSEGV));
+    PyDict_SetItemString(d,"SIGSYS", SWIG_From_int((int)wxSIGSYS));
+    PyDict_SetItemString(d,"SIGPIPE", SWIG_From_int((int)wxSIGPIPE));
+    PyDict_SetItemString(d,"SIGALRM", SWIG_From_int((int)wxSIGALRM));
+    PyDict_SetItemString(d,"SIGTERM", SWIG_From_int((int)wxSIGTERM));
     PyDict_SetItemString(d, "wxEVT_END_PROCESS", PyInt_FromLong(wxEVT_END_PROCESS));
-    PyDict_SetItemString(d,"EXEC_ASYNC", SWIG_FromInt((int)wxEXEC_ASYNC));
-    PyDict_SetItemString(d,"EXEC_SYNC", SWIG_FromInt((int)wxEXEC_SYNC));
-    PyDict_SetItemString(d,"EXEC_NOHIDE", SWIG_FromInt((int)wxEXEC_NOHIDE));
-    PyDict_SetItemString(d,"EXEC_MAKE_GROUP_LEADER", SWIG_FromInt((int)wxEXEC_MAKE_GROUP_LEADER));
+    PyDict_SetItemString(d,"EXEC_ASYNC", SWIG_From_int((int)wxEXEC_ASYNC));
+    PyDict_SetItemString(d,"EXEC_SYNC", SWIG_From_int((int)wxEXEC_SYNC));
+    PyDict_SetItemString(d,"EXEC_NOHIDE", SWIG_From_int((int)wxEXEC_NOHIDE));
+    PyDict_SetItemString(d,"EXEC_MAKE_GROUP_LEADER", SWIG_From_int((int)wxEXEC_MAKE_GROUP_LEADER));
     
     wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess");
     
-    PyDict_SetItemString(d,"JOYSTICK1", SWIG_FromInt((int)wxJOYSTICK1));
-    PyDict_SetItemString(d,"JOYSTICK2", SWIG_FromInt((int)wxJOYSTICK2));
-    PyDict_SetItemString(d,"JOY_BUTTON_ANY", SWIG_FromInt((int)wxJOY_BUTTON_ANY));
-    PyDict_SetItemString(d,"JOY_BUTTON1", SWIG_FromInt((int)wxJOY_BUTTON1));
-    PyDict_SetItemString(d,"JOY_BUTTON2", SWIG_FromInt((int)wxJOY_BUTTON2));
-    PyDict_SetItemString(d,"JOY_BUTTON3", SWIG_FromInt((int)wxJOY_BUTTON3));
-    PyDict_SetItemString(d,"JOY_BUTTON4", SWIG_FromInt((int)wxJOY_BUTTON4));
+    PyDict_SetItemString(d,"JOYSTICK1", SWIG_From_int((int)wxJOYSTICK1));
+    PyDict_SetItemString(d,"JOYSTICK2", SWIG_From_int((int)wxJOYSTICK2));
+    PyDict_SetItemString(d,"JOY_BUTTON_ANY", SWIG_From_int((int)wxJOY_BUTTON_ANY));
+    PyDict_SetItemString(d,"JOY_BUTTON1", SWIG_From_int((int)wxJOY_BUTTON1));
+    PyDict_SetItemString(d,"JOY_BUTTON2", SWIG_From_int((int)wxJOY_BUTTON2));
+    PyDict_SetItemString(d,"JOY_BUTTON3", SWIG_From_int((int)wxJOY_BUTTON3));
+    PyDict_SetItemString(d,"JOY_BUTTON4", SWIG_From_int((int)wxJOY_BUTTON4));
     PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_DOWN", PyInt_FromLong(wxEVT_JOY_BUTTON_DOWN));
     PyDict_SetItemString(d, "wxEVT_JOY_BUTTON_UP", PyInt_FromLong(wxEVT_JOY_BUTTON_UP));
     PyDict_SetItemString(d, "wxEVT_JOY_MOVE", PyInt_FromLong(wxEVT_JOY_MOVE));
     PyDict_SetItemString(d, "wxEVT_JOY_ZMOVE", PyInt_FromLong(wxEVT_JOY_ZMOVE));
-    PyDict_SetItemString(d,"SOUND_SYNC", SWIG_FromInt((int)wxSOUND_SYNC));
-    PyDict_SetItemString(d,"SOUND_ASYNC", SWIG_FromInt((int)wxSOUND_ASYNC));
-    PyDict_SetItemString(d,"SOUND_LOOP", SWIG_FromInt((int)wxSOUND_LOOP));
-    PyDict_SetItemString(d,"MAILCAP_STANDARD", SWIG_FromInt((int)wxMAILCAP_STANDARD));
-    PyDict_SetItemString(d,"MAILCAP_NETSCAPE", SWIG_FromInt((int)wxMAILCAP_NETSCAPE));
-    PyDict_SetItemString(d,"MAILCAP_KDE", SWIG_FromInt((int)wxMAILCAP_KDE));
-    PyDict_SetItemString(d,"MAILCAP_GNOME", SWIG_FromInt((int)wxMAILCAP_GNOME));
-    PyDict_SetItemString(d,"MAILCAP_ALL", SWIG_FromInt((int)wxMAILCAP_ALL));
+    PyDict_SetItemString(d,"SOUND_SYNC", SWIG_From_int((int)wxSOUND_SYNC));
+    PyDict_SetItemString(d,"SOUND_ASYNC", SWIG_From_int((int)wxSOUND_ASYNC));
+    PyDict_SetItemString(d,"SOUND_LOOP", SWIG_From_int((int)wxSOUND_LOOP));
+    PyDict_SetItemString(d,"MAILCAP_STANDARD", SWIG_From_int((int)wxMAILCAP_STANDARD));
+    PyDict_SetItemString(d,"MAILCAP_NETSCAPE", SWIG_From_int((int)wxMAILCAP_NETSCAPE));
+    PyDict_SetItemString(d,"MAILCAP_KDE", SWIG_From_int((int)wxMAILCAP_KDE));
+    PyDict_SetItemString(d,"MAILCAP_GNOME", SWIG_From_int((int)wxMAILCAP_GNOME));
+    PyDict_SetItemString(d,"MAILCAP_ALL", SWIG_From_int((int)wxMAILCAP_ALL));
     SWIG_addvarlink(SWIG_globals,(char*)"TheMimeTypesManager",_wrap_TheMimeTypesManager_get, _wrap_TheMimeTypesManager_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_TOOLBAR",_wrap_ART_TOOLBAR_get, _wrap_ART_TOOLBAR_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ART_MENU",_wrap_ART_MENU_get, _wrap_ART_MENU_set);
@@ -30138,206 +30262,206 @@ SWIGEXPORT(void) SWIG_init(void) {
     
     wxPyPtrTypeMap_Add("wxArtProvider", "wxPyArtProvider");
     
-    PyDict_SetItemString(d,"CONFIG_USE_LOCAL_FILE", SWIG_FromInt((int)wxCONFIG_USE_LOCAL_FILE));
-    PyDict_SetItemString(d,"CONFIG_USE_GLOBAL_FILE", SWIG_FromInt((int)wxCONFIG_USE_GLOBAL_FILE));
-    PyDict_SetItemString(d,"CONFIG_USE_RELATIVE_PATH", SWIG_FromInt((int)wxCONFIG_USE_RELATIVE_PATH));
-    PyDict_SetItemString(d,"CONFIG_USE_NO_ESCAPE_CHARACTERS", SWIG_FromInt((int)wxCONFIG_USE_NO_ESCAPE_CHARACTERS));
-    PyDict_SetItemString(d,"ConfigBase_Type_Unknown", SWIG_FromInt((int)wxConfigBase::Type_Unknown));
-    PyDict_SetItemString(d,"ConfigBase_Type_String", SWIG_FromInt((int)wxConfigBase::Type_String));
-    PyDict_SetItemString(d,"ConfigBase_Type_Boolean", SWIG_FromInt((int)wxConfigBase::Type_Boolean));
-    PyDict_SetItemString(d,"ConfigBase_Type_Integer", SWIG_FromInt((int)wxConfigBase::Type_Integer));
-    PyDict_SetItemString(d,"ConfigBase_Type_Float", SWIG_FromInt((int)wxConfigBase::Type_Float));
+    PyDict_SetItemString(d,"CONFIG_USE_LOCAL_FILE", SWIG_From_int((int)wxCONFIG_USE_LOCAL_FILE));
+    PyDict_SetItemString(d,"CONFIG_USE_GLOBAL_FILE", SWIG_From_int((int)wxCONFIG_USE_GLOBAL_FILE));
+    PyDict_SetItemString(d,"CONFIG_USE_RELATIVE_PATH", SWIG_From_int((int)wxCONFIG_USE_RELATIVE_PATH));
+    PyDict_SetItemString(d,"CONFIG_USE_NO_ESCAPE_CHARACTERS", SWIG_From_int((int)wxCONFIG_USE_NO_ESCAPE_CHARACTERS));
+    PyDict_SetItemString(d,"ConfigBase_Type_Unknown", SWIG_From_int((int)wxConfigBase::Type_Unknown));
+    PyDict_SetItemString(d,"ConfigBase_Type_String", SWIG_From_int((int)wxConfigBase::Type_String));
+    PyDict_SetItemString(d,"ConfigBase_Type_Boolean", SWIG_From_int((int)wxConfigBase::Type_Boolean));
+    PyDict_SetItemString(d,"ConfigBase_Type_Integer", SWIG_From_int((int)wxConfigBase::Type_Integer));
+    PyDict_SetItemString(d,"ConfigBase_Type_Float", SWIG_From_int((int)wxConfigBase::Type_Float));
     SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set);
-    PyDict_SetItemString(d,"DateTime_Local", SWIG_FromInt((int)wxDateTime::Local));
-    PyDict_SetItemString(d,"DateTime_GMT_12", SWIG_FromInt((int)wxDateTime::GMT_12));
-    PyDict_SetItemString(d,"DateTime_GMT_11", SWIG_FromInt((int)wxDateTime::GMT_11));
-    PyDict_SetItemString(d,"DateTime_GMT_10", SWIG_FromInt((int)wxDateTime::GMT_10));
-    PyDict_SetItemString(d,"DateTime_GMT_9", SWIG_FromInt((int)wxDateTime::GMT_9));
-    PyDict_SetItemString(d,"DateTime_GMT_8", SWIG_FromInt((int)wxDateTime::GMT_8));
-    PyDict_SetItemString(d,"DateTime_GMT_7", SWIG_FromInt((int)wxDateTime::GMT_7));
-    PyDict_SetItemString(d,"DateTime_GMT_6", SWIG_FromInt((int)wxDateTime::GMT_6));
-    PyDict_SetItemString(d,"DateTime_GMT_5", SWIG_FromInt((int)wxDateTime::GMT_5));
-    PyDict_SetItemString(d,"DateTime_GMT_4", SWIG_FromInt((int)wxDateTime::GMT_4));
-    PyDict_SetItemString(d,"DateTime_GMT_3", SWIG_FromInt((int)wxDateTime::GMT_3));
-    PyDict_SetItemString(d,"DateTime_GMT_2", SWIG_FromInt((int)wxDateTime::GMT_2));
-    PyDict_SetItemString(d,"DateTime_GMT_1", SWIG_FromInt((int)wxDateTime::GMT_1));
-    PyDict_SetItemString(d,"DateTime_GMT0", SWIG_FromInt((int)wxDateTime::GMT0));
-    PyDict_SetItemString(d,"DateTime_GMT1", SWIG_FromInt((int)wxDateTime::GMT1));
-    PyDict_SetItemString(d,"DateTime_GMT2", SWIG_FromInt((int)wxDateTime::GMT2));
-    PyDict_SetItemString(d,"DateTime_GMT3", SWIG_FromInt((int)wxDateTime::GMT3));
-    PyDict_SetItemString(d,"DateTime_GMT4", SWIG_FromInt((int)wxDateTime::GMT4));
-    PyDict_SetItemString(d,"DateTime_GMT5", SWIG_FromInt((int)wxDateTime::GMT5));
-    PyDict_SetItemString(d,"DateTime_GMT6", SWIG_FromInt((int)wxDateTime::GMT6));
-    PyDict_SetItemString(d,"DateTime_GMT7", SWIG_FromInt((int)wxDateTime::GMT7));
-    PyDict_SetItemString(d,"DateTime_GMT8", SWIG_FromInt((int)wxDateTime::GMT8));
-    PyDict_SetItemString(d,"DateTime_GMT9", SWIG_FromInt((int)wxDateTime::GMT9));
-    PyDict_SetItemString(d,"DateTime_GMT10", SWIG_FromInt((int)wxDateTime::GMT10));
-    PyDict_SetItemString(d,"DateTime_GMT11", SWIG_FromInt((int)wxDateTime::GMT11));
-    PyDict_SetItemString(d,"DateTime_GMT12", SWIG_FromInt((int)wxDateTime::GMT12));
-    PyDict_SetItemString(d,"DateTime_WET", SWIG_FromInt((int)wxDateTime::WET));
-    PyDict_SetItemString(d,"DateTime_WEST", SWIG_FromInt((int)wxDateTime::WEST));
-    PyDict_SetItemString(d,"DateTime_CET", SWIG_FromInt((int)wxDateTime::CET));
-    PyDict_SetItemString(d,"DateTime_CEST", SWIG_FromInt((int)wxDateTime::CEST));
-    PyDict_SetItemString(d,"DateTime_EET", SWIG_FromInt((int)wxDateTime::EET));
-    PyDict_SetItemString(d,"DateTime_EEST", SWIG_FromInt((int)wxDateTime::EEST));
-    PyDict_SetItemString(d,"DateTime_MSK", SWIG_FromInt((int)wxDateTime::MSK));
-    PyDict_SetItemString(d,"DateTime_MSD", SWIG_FromInt((int)wxDateTime::MSD));
-    PyDict_SetItemString(d,"DateTime_AST", SWIG_FromInt((int)wxDateTime::AST));
-    PyDict_SetItemString(d,"DateTime_ADT", SWIG_FromInt((int)wxDateTime::ADT));
-    PyDict_SetItemString(d,"DateTime_EST", SWIG_FromInt((int)wxDateTime::EST));
-    PyDict_SetItemString(d,"DateTime_EDT", SWIG_FromInt((int)wxDateTime::EDT));
-    PyDict_SetItemString(d,"DateTime_CST", SWIG_FromInt((int)wxDateTime::CST));
-    PyDict_SetItemString(d,"DateTime_CDT", SWIG_FromInt((int)wxDateTime::CDT));
-    PyDict_SetItemString(d,"DateTime_MST", SWIG_FromInt((int)wxDateTime::MST));
-    PyDict_SetItemString(d,"DateTime_MDT", SWIG_FromInt((int)wxDateTime::MDT));
-    PyDict_SetItemString(d,"DateTime_PST", SWIG_FromInt((int)wxDateTime::PST));
-    PyDict_SetItemString(d,"DateTime_PDT", SWIG_FromInt((int)wxDateTime::PDT));
-    PyDict_SetItemString(d,"DateTime_HST", SWIG_FromInt((int)wxDateTime::HST));
-    PyDict_SetItemString(d,"DateTime_AKST", SWIG_FromInt((int)wxDateTime::AKST));
-    PyDict_SetItemString(d,"DateTime_AKDT", SWIG_FromInt((int)wxDateTime::AKDT));
-    PyDict_SetItemString(d,"DateTime_A_WST", SWIG_FromInt((int)wxDateTime::A_WST));
-    PyDict_SetItemString(d,"DateTime_A_CST", SWIG_FromInt((int)wxDateTime::A_CST));
-    PyDict_SetItemString(d,"DateTime_A_EST", SWIG_FromInt((int)wxDateTime::A_EST));
-    PyDict_SetItemString(d,"DateTime_A_ESST", SWIG_FromInt((int)wxDateTime::A_ESST));
-    PyDict_SetItemString(d,"DateTime_UTC", SWIG_FromInt((int)wxDateTime::UTC));
-    PyDict_SetItemString(d,"DateTime_Gregorian", SWIG_FromInt((int)wxDateTime::Gregorian));
-    PyDict_SetItemString(d,"DateTime_Julian", SWIG_FromInt((int)wxDateTime::Julian));
-    PyDict_SetItemString(d,"DateTime_Gr_Unknown", SWIG_FromInt((int)wxDateTime::Gr_Unknown));
-    PyDict_SetItemString(d,"DateTime_Gr_Standard", SWIG_FromInt((int)wxDateTime::Gr_Standard));
-    PyDict_SetItemString(d,"DateTime_Gr_Alaska", SWIG_FromInt((int)wxDateTime::Gr_Alaska));
-    PyDict_SetItemString(d,"DateTime_Gr_Albania", SWIG_FromInt((int)wxDateTime::Gr_Albania));
-    PyDict_SetItemString(d,"DateTime_Gr_Austria", SWIG_FromInt((int)wxDateTime::Gr_Austria));
-    PyDict_SetItemString(d,"DateTime_Gr_Austria_Brixen", SWIG_FromInt((int)wxDateTime::Gr_Austria_Brixen));
-    PyDict_SetItemString(d,"DateTime_Gr_Austria_Salzburg", SWIG_FromInt((int)wxDateTime::Gr_Austria_Salzburg));
-    PyDict_SetItemString(d,"DateTime_Gr_Austria_Tyrol", SWIG_FromInt((int)wxDateTime::Gr_Austria_Tyrol));
-    PyDict_SetItemString(d,"DateTime_Gr_Austria_Carinthia", SWIG_FromInt((int)wxDateTime::Gr_Austria_Carinthia));
-    PyDict_SetItemString(d,"DateTime_Gr_Austria_Styria", SWIG_FromInt((int)wxDateTime::Gr_Austria_Styria));
-    PyDict_SetItemString(d,"DateTime_Gr_Belgium", SWIG_FromInt((int)wxDateTime::Gr_Belgium));
-    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria", SWIG_FromInt((int)wxDateTime::Gr_Bulgaria));
-    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_1", SWIG_FromInt((int)wxDateTime::Gr_Bulgaria_1));
-    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_2", SWIG_FromInt((int)wxDateTime::Gr_Bulgaria_2));
-    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_3", SWIG_FromInt((int)wxDateTime::Gr_Bulgaria_3));
-    PyDict_SetItemString(d,"DateTime_Gr_Canada", SWIG_FromInt((int)wxDateTime::Gr_Canada));
-    PyDict_SetItemString(d,"DateTime_Gr_China", SWIG_FromInt((int)wxDateTime::Gr_China));
-    PyDict_SetItemString(d,"DateTime_Gr_China_1", SWIG_FromInt((int)wxDateTime::Gr_China_1));
-    PyDict_SetItemString(d,"DateTime_Gr_China_2", SWIG_FromInt((int)wxDateTime::Gr_China_2));
-    PyDict_SetItemString(d,"DateTime_Gr_Czechoslovakia", SWIG_FromInt((int)wxDateTime::Gr_Czechoslovakia));
-    PyDict_SetItemString(d,"DateTime_Gr_Denmark", SWIG_FromInt((int)wxDateTime::Gr_Denmark));
-    PyDict_SetItemString(d,"DateTime_Gr_Egypt", SWIG_FromInt((int)wxDateTime::Gr_Egypt));
-    PyDict_SetItemString(d,"DateTime_Gr_Estonia", SWIG_FromInt((int)wxDateTime::Gr_Estonia));
-    PyDict_SetItemString(d,"DateTime_Gr_Finland", SWIG_FromInt((int)wxDateTime::Gr_Finland));
-    PyDict_SetItemString(d,"DateTime_Gr_France", SWIG_FromInt((int)wxDateTime::Gr_France));
-    PyDict_SetItemString(d,"DateTime_Gr_France_Alsace", SWIG_FromInt((int)wxDateTime::Gr_France_Alsace));
-    PyDict_SetItemString(d,"DateTime_Gr_France_Lorraine", SWIG_FromInt((int)wxDateTime::Gr_France_Lorraine));
-    PyDict_SetItemString(d,"DateTime_Gr_France_Strasbourg", SWIG_FromInt((int)wxDateTime::Gr_France_Strasbourg));
-    PyDict_SetItemString(d,"DateTime_Gr_Germany", SWIG_FromInt((int)wxDateTime::Gr_Germany));
-    PyDict_SetItemString(d,"DateTime_Gr_Germany_Catholic", SWIG_FromInt((int)wxDateTime::Gr_Germany_Catholic));
-    PyDict_SetItemString(d,"DateTime_Gr_Germany_Prussia", SWIG_FromInt((int)wxDateTime::Gr_Germany_Prussia));
-    PyDict_SetItemString(d,"DateTime_Gr_Germany_Protestant", SWIG_FromInt((int)wxDateTime::Gr_Germany_Protestant));
-    PyDict_SetItemString(d,"DateTime_Gr_GreatBritain", SWIG_FromInt((int)wxDateTime::Gr_GreatBritain));
-    PyDict_SetItemString(d,"DateTime_Gr_Greece", SWIG_FromInt((int)wxDateTime::Gr_Greece));
-    PyDict_SetItemString(d,"DateTime_Gr_Hungary", SWIG_FromInt((int)wxDateTime::Gr_Hungary));
-    PyDict_SetItemString(d,"DateTime_Gr_Ireland", SWIG_FromInt((int)wxDateTime::Gr_Ireland));
-    PyDict_SetItemString(d,"DateTime_Gr_Italy", SWIG_FromInt((int)wxDateTime::Gr_Italy));
-    PyDict_SetItemString(d,"DateTime_Gr_Japan", SWIG_FromInt((int)wxDateTime::Gr_Japan));
-    PyDict_SetItemString(d,"DateTime_Gr_Japan_1", SWIG_FromInt((int)wxDateTime::Gr_Japan_1));
-    PyDict_SetItemString(d,"DateTime_Gr_Japan_2", SWIG_FromInt((int)wxDateTime::Gr_Japan_2));
-    PyDict_SetItemString(d,"DateTime_Gr_Japan_3", SWIG_FromInt((int)wxDateTime::Gr_Japan_3));
-    PyDict_SetItemString(d,"DateTime_Gr_Latvia", SWIG_FromInt((int)wxDateTime::Gr_Latvia));
-    PyDict_SetItemString(d,"DateTime_Gr_Lithuania", SWIG_FromInt((int)wxDateTime::Gr_Lithuania));
-    PyDict_SetItemString(d,"DateTime_Gr_Luxemburg", SWIG_FromInt((int)wxDateTime::Gr_Luxemburg));
-    PyDict_SetItemString(d,"DateTime_Gr_Netherlands", SWIG_FromInt((int)wxDateTime::Gr_Netherlands));
-    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Groningen", SWIG_FromInt((int)wxDateTime::Gr_Netherlands_Groningen));
-    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Gelderland", SWIG_FromInt((int)wxDateTime::Gr_Netherlands_Gelderland));
-    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Utrecht", SWIG_FromInt((int)wxDateTime::Gr_Netherlands_Utrecht));
-    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Friesland", SWIG_FromInt((int)wxDateTime::Gr_Netherlands_Friesland));
-    PyDict_SetItemString(d,"DateTime_Gr_Norway", SWIG_FromInt((int)wxDateTime::Gr_Norway));
-    PyDict_SetItemString(d,"DateTime_Gr_Poland", SWIG_FromInt((int)wxDateTime::Gr_Poland));
-    PyDict_SetItemString(d,"DateTime_Gr_Portugal", SWIG_FromInt((int)wxDateTime::Gr_Portugal));
-    PyDict_SetItemString(d,"DateTime_Gr_Romania", SWIG_FromInt((int)wxDateTime::Gr_Romania));
-    PyDict_SetItemString(d,"DateTime_Gr_Russia", SWIG_FromInt((int)wxDateTime::Gr_Russia));
-    PyDict_SetItemString(d,"DateTime_Gr_Scotland", SWIG_FromInt((int)wxDateTime::Gr_Scotland));
-    PyDict_SetItemString(d,"DateTime_Gr_Spain", SWIG_FromInt((int)wxDateTime::Gr_Spain));
-    PyDict_SetItemString(d,"DateTime_Gr_Sweden", SWIG_FromInt((int)wxDateTime::Gr_Sweden));
-    PyDict_SetItemString(d,"DateTime_Gr_Switzerland", SWIG_FromInt((int)wxDateTime::Gr_Switzerland));
-    PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Catholic", SWIG_FromInt((int)wxDateTime::Gr_Switzerland_Catholic));
-    PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Protestant", SWIG_FromInt((int)wxDateTime::Gr_Switzerland_Protestant));
-    PyDict_SetItemString(d,"DateTime_Gr_Turkey", SWIG_FromInt((int)wxDateTime::Gr_Turkey));
-    PyDict_SetItemString(d,"DateTime_Gr_USA", SWIG_FromInt((int)wxDateTime::Gr_USA));
-    PyDict_SetItemString(d,"DateTime_Gr_Wales", SWIG_FromInt((int)wxDateTime::Gr_Wales));
-    PyDict_SetItemString(d,"DateTime_Gr_Yugoslavia", SWIG_FromInt((int)wxDateTime::Gr_Yugoslavia));
-    PyDict_SetItemString(d,"DateTime_Country_Unknown", SWIG_FromInt((int)wxDateTime::Country_Unknown));
-    PyDict_SetItemString(d,"DateTime_Country_Default", SWIG_FromInt((int)wxDateTime::Country_Default));
-    PyDict_SetItemString(d,"DateTime_Country_WesternEurope_Start", SWIG_FromInt((int)wxDateTime::Country_WesternEurope_Start));
-    PyDict_SetItemString(d,"DateTime_Country_EEC", SWIG_FromInt((int)wxDateTime::Country_EEC));
-    PyDict_SetItemString(d,"DateTime_France", SWIG_FromInt((int)wxDateTime::France));
-    PyDict_SetItemString(d,"DateTime_Germany", SWIG_FromInt((int)wxDateTime::Germany));
-    PyDict_SetItemString(d,"DateTime_UK", SWIG_FromInt((int)wxDateTime::UK));
-    PyDict_SetItemString(d,"DateTime_Country_WesternEurope_End", SWIG_FromInt((int)wxDateTime::Country_WesternEurope_End));
-    PyDict_SetItemString(d,"DateTime_Russia", SWIG_FromInt((int)wxDateTime::Russia));
-    PyDict_SetItemString(d,"DateTime_USA", SWIG_FromInt((int)wxDateTime::USA));
-    PyDict_SetItemString(d,"DateTime_Jan", SWIG_FromInt((int)wxDateTime::Jan));
-    PyDict_SetItemString(d,"DateTime_Feb", SWIG_FromInt((int)wxDateTime::Feb));
-    PyDict_SetItemString(d,"DateTime_Mar", SWIG_FromInt((int)wxDateTime::Mar));
-    PyDict_SetItemString(d,"DateTime_Apr", SWIG_FromInt((int)wxDateTime::Apr));
-    PyDict_SetItemString(d,"DateTime_May", SWIG_FromInt((int)wxDateTime::May));
-    PyDict_SetItemString(d,"DateTime_Jun", SWIG_FromInt((int)wxDateTime::Jun));
-    PyDict_SetItemString(d,"DateTime_Jul", SWIG_FromInt((int)wxDateTime::Jul));
-    PyDict_SetItemString(d,"DateTime_Aug", SWIG_FromInt((int)wxDateTime::Aug));
-    PyDict_SetItemString(d,"DateTime_Sep", SWIG_FromInt((int)wxDateTime::Sep));
-    PyDict_SetItemString(d,"DateTime_Oct", SWIG_FromInt((int)wxDateTime::Oct));
-    PyDict_SetItemString(d,"DateTime_Nov", SWIG_FromInt((int)wxDateTime::Nov));
-    PyDict_SetItemString(d,"DateTime_Dec", SWIG_FromInt((int)wxDateTime::Dec));
-    PyDict_SetItemString(d,"DateTime_Inv_Month", SWIG_FromInt((int)wxDateTime::Inv_Month));
-    PyDict_SetItemString(d,"DateTime_Sun", SWIG_FromInt((int)wxDateTime::Sun));
-    PyDict_SetItemString(d,"DateTime_Mon", SWIG_FromInt((int)wxDateTime::Mon));
-    PyDict_SetItemString(d,"DateTime_Tue", SWIG_FromInt((int)wxDateTime::Tue));
-    PyDict_SetItemString(d,"DateTime_Wed", SWIG_FromInt((int)wxDateTime::Wed));
-    PyDict_SetItemString(d,"DateTime_Thu", SWIG_FromInt((int)wxDateTime::Thu));
-    PyDict_SetItemString(d,"DateTime_Fri", SWIG_FromInt((int)wxDateTime::Fri));
-    PyDict_SetItemString(d,"DateTime_Sat", SWIG_FromInt((int)wxDateTime::Sat));
-    PyDict_SetItemString(d,"DateTime_Inv_WeekDay", SWIG_FromInt((int)wxDateTime::Inv_WeekDay));
-    PyDict_SetItemString(d,"DateTime_Inv_Year", SWIG_FromInt((int)wxDateTime::Inv_Year));
-    PyDict_SetItemString(d,"DateTime_Name_Full", SWIG_FromInt((int)wxDateTime::Name_Full));
-    PyDict_SetItemString(d,"DateTime_Name_Abbr", SWIG_FromInt((int)wxDateTime::Name_Abbr));
-    PyDict_SetItemString(d,"DateTime_Default_First", SWIG_FromInt((int)wxDateTime::Default_First));
-    PyDict_SetItemString(d,"DateTime_Monday_First", SWIG_FromInt((int)wxDateTime::Monday_First));
-    PyDict_SetItemString(d,"DateTime_Sunday_First", SWIG_FromInt((int)wxDateTime::Sunday_First));
+    PyDict_SetItemString(d,"DateTime_Local", SWIG_From_int((int)wxDateTime::Local));
+    PyDict_SetItemString(d,"DateTime_GMT_12", SWIG_From_int((int)wxDateTime::GMT_12));
+    PyDict_SetItemString(d,"DateTime_GMT_11", SWIG_From_int((int)wxDateTime::GMT_11));
+    PyDict_SetItemString(d,"DateTime_GMT_10", SWIG_From_int((int)wxDateTime::GMT_10));
+    PyDict_SetItemString(d,"DateTime_GMT_9", SWIG_From_int((int)wxDateTime::GMT_9));
+    PyDict_SetItemString(d,"DateTime_GMT_8", SWIG_From_int((int)wxDateTime::GMT_8));
+    PyDict_SetItemString(d,"DateTime_GMT_7", SWIG_From_int((int)wxDateTime::GMT_7));
+    PyDict_SetItemString(d,"DateTime_GMT_6", SWIG_From_int((int)wxDateTime::GMT_6));
+    PyDict_SetItemString(d,"DateTime_GMT_5", SWIG_From_int((int)wxDateTime::GMT_5));
+    PyDict_SetItemString(d,"DateTime_GMT_4", SWIG_From_int((int)wxDateTime::GMT_4));
+    PyDict_SetItemString(d,"DateTime_GMT_3", SWIG_From_int((int)wxDateTime::GMT_3));
+    PyDict_SetItemString(d,"DateTime_GMT_2", SWIG_From_int((int)wxDateTime::GMT_2));
+    PyDict_SetItemString(d,"DateTime_GMT_1", SWIG_From_int((int)wxDateTime::GMT_1));
+    PyDict_SetItemString(d,"DateTime_GMT0", SWIG_From_int((int)wxDateTime::GMT0));
+    PyDict_SetItemString(d,"DateTime_GMT1", SWIG_From_int((int)wxDateTime::GMT1));
+    PyDict_SetItemString(d,"DateTime_GMT2", SWIG_From_int((int)wxDateTime::GMT2));
+    PyDict_SetItemString(d,"DateTime_GMT3", SWIG_From_int((int)wxDateTime::GMT3));
+    PyDict_SetItemString(d,"DateTime_GMT4", SWIG_From_int((int)wxDateTime::GMT4));
+    PyDict_SetItemString(d,"DateTime_GMT5", SWIG_From_int((int)wxDateTime::GMT5));
+    PyDict_SetItemString(d,"DateTime_GMT6", SWIG_From_int((int)wxDateTime::GMT6));
+    PyDict_SetItemString(d,"DateTime_GMT7", SWIG_From_int((int)wxDateTime::GMT7));
+    PyDict_SetItemString(d,"DateTime_GMT8", SWIG_From_int((int)wxDateTime::GMT8));
+    PyDict_SetItemString(d,"DateTime_GMT9", SWIG_From_int((int)wxDateTime::GMT9));
+    PyDict_SetItemString(d,"DateTime_GMT10", SWIG_From_int((int)wxDateTime::GMT10));
+    PyDict_SetItemString(d,"DateTime_GMT11", SWIG_From_int((int)wxDateTime::GMT11));
+    PyDict_SetItemString(d,"DateTime_GMT12", SWIG_From_int((int)wxDateTime::GMT12));
+    PyDict_SetItemString(d,"DateTime_WET", SWIG_From_int((int)wxDateTime::WET));
+    PyDict_SetItemString(d,"DateTime_WEST", SWIG_From_int((int)wxDateTime::WEST));
+    PyDict_SetItemString(d,"DateTime_CET", SWIG_From_int((int)wxDateTime::CET));
+    PyDict_SetItemString(d,"DateTime_CEST", SWIG_From_int((int)wxDateTime::CEST));
+    PyDict_SetItemString(d,"DateTime_EET", SWIG_From_int((int)wxDateTime::EET));
+    PyDict_SetItemString(d,"DateTime_EEST", SWIG_From_int((int)wxDateTime::EEST));
+    PyDict_SetItemString(d,"DateTime_MSK", SWIG_From_int((int)wxDateTime::MSK));
+    PyDict_SetItemString(d,"DateTime_MSD", SWIG_From_int((int)wxDateTime::MSD));
+    PyDict_SetItemString(d,"DateTime_AST", SWIG_From_int((int)wxDateTime::AST));
+    PyDict_SetItemString(d,"DateTime_ADT", SWIG_From_int((int)wxDateTime::ADT));
+    PyDict_SetItemString(d,"DateTime_EST", SWIG_From_int((int)wxDateTime::EST));
+    PyDict_SetItemString(d,"DateTime_EDT", SWIG_From_int((int)wxDateTime::EDT));
+    PyDict_SetItemString(d,"DateTime_CST", SWIG_From_int((int)wxDateTime::CST));
+    PyDict_SetItemString(d,"DateTime_CDT", SWIG_From_int((int)wxDateTime::CDT));
+    PyDict_SetItemString(d,"DateTime_MST", SWIG_From_int((int)wxDateTime::MST));
+    PyDict_SetItemString(d,"DateTime_MDT", SWIG_From_int((int)wxDateTime::MDT));
+    PyDict_SetItemString(d,"DateTime_PST", SWIG_From_int((int)wxDateTime::PST));
+    PyDict_SetItemString(d,"DateTime_PDT", SWIG_From_int((int)wxDateTime::PDT));
+    PyDict_SetItemString(d,"DateTime_HST", SWIG_From_int((int)wxDateTime::HST));
+    PyDict_SetItemString(d,"DateTime_AKST", SWIG_From_int((int)wxDateTime::AKST));
+    PyDict_SetItemString(d,"DateTime_AKDT", SWIG_From_int((int)wxDateTime::AKDT));
+    PyDict_SetItemString(d,"DateTime_A_WST", SWIG_From_int((int)wxDateTime::A_WST));
+    PyDict_SetItemString(d,"DateTime_A_CST", SWIG_From_int((int)wxDateTime::A_CST));
+    PyDict_SetItemString(d,"DateTime_A_EST", SWIG_From_int((int)wxDateTime::A_EST));
+    PyDict_SetItemString(d,"DateTime_A_ESST", SWIG_From_int((int)wxDateTime::A_ESST));
+    PyDict_SetItemString(d,"DateTime_UTC", SWIG_From_int((int)wxDateTime::UTC));
+    PyDict_SetItemString(d,"DateTime_Gregorian", SWIG_From_int((int)wxDateTime::Gregorian));
+    PyDict_SetItemString(d,"DateTime_Julian", SWIG_From_int((int)wxDateTime::Julian));
+    PyDict_SetItemString(d,"DateTime_Gr_Unknown", SWIG_From_int((int)wxDateTime::Gr_Unknown));
+    PyDict_SetItemString(d,"DateTime_Gr_Standard", SWIG_From_int((int)wxDateTime::Gr_Standard));
+    PyDict_SetItemString(d,"DateTime_Gr_Alaska", SWIG_From_int((int)wxDateTime::Gr_Alaska));
+    PyDict_SetItemString(d,"DateTime_Gr_Albania", SWIG_From_int((int)wxDateTime::Gr_Albania));
+    PyDict_SetItemString(d,"DateTime_Gr_Austria", SWIG_From_int((int)wxDateTime::Gr_Austria));
+    PyDict_SetItemString(d,"DateTime_Gr_Austria_Brixen", SWIG_From_int((int)wxDateTime::Gr_Austria_Brixen));
+    PyDict_SetItemString(d,"DateTime_Gr_Austria_Salzburg", SWIG_From_int((int)wxDateTime::Gr_Austria_Salzburg));
+    PyDict_SetItemString(d,"DateTime_Gr_Austria_Tyrol", SWIG_From_int((int)wxDateTime::Gr_Austria_Tyrol));
+    PyDict_SetItemString(d,"DateTime_Gr_Austria_Carinthia", SWIG_From_int((int)wxDateTime::Gr_Austria_Carinthia));
+    PyDict_SetItemString(d,"DateTime_Gr_Austria_Styria", SWIG_From_int((int)wxDateTime::Gr_Austria_Styria));
+    PyDict_SetItemString(d,"DateTime_Gr_Belgium", SWIG_From_int((int)wxDateTime::Gr_Belgium));
+    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria", SWIG_From_int((int)wxDateTime::Gr_Bulgaria));
+    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_1", SWIG_From_int((int)wxDateTime::Gr_Bulgaria_1));
+    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_2", SWIG_From_int((int)wxDateTime::Gr_Bulgaria_2));
+    PyDict_SetItemString(d,"DateTime_Gr_Bulgaria_3", SWIG_From_int((int)wxDateTime::Gr_Bulgaria_3));
+    PyDict_SetItemString(d,"DateTime_Gr_Canada", SWIG_From_int((int)wxDateTime::Gr_Canada));
+    PyDict_SetItemString(d,"DateTime_Gr_China", SWIG_From_int((int)wxDateTime::Gr_China));
+    PyDict_SetItemString(d,"DateTime_Gr_China_1", SWIG_From_int((int)wxDateTime::Gr_China_1));
+    PyDict_SetItemString(d,"DateTime_Gr_China_2", SWIG_From_int((int)wxDateTime::Gr_China_2));
+    PyDict_SetItemString(d,"DateTime_Gr_Czechoslovakia", SWIG_From_int((int)wxDateTime::Gr_Czechoslovakia));
+    PyDict_SetItemString(d,"DateTime_Gr_Denmark", SWIG_From_int((int)wxDateTime::Gr_Denmark));
+    PyDict_SetItemString(d,"DateTime_Gr_Egypt", SWIG_From_int((int)wxDateTime::Gr_Egypt));
+    PyDict_SetItemString(d,"DateTime_Gr_Estonia", SWIG_From_int((int)wxDateTime::Gr_Estonia));
+    PyDict_SetItemString(d,"DateTime_Gr_Finland", SWIG_From_int((int)wxDateTime::Gr_Finland));
+    PyDict_SetItemString(d,"DateTime_Gr_France", SWIG_From_int((int)wxDateTime::Gr_France));
+    PyDict_SetItemString(d,"DateTime_Gr_France_Alsace", SWIG_From_int((int)wxDateTime::Gr_France_Alsace));
+    PyDict_SetItemString(d,"DateTime_Gr_France_Lorraine", SWIG_From_int((int)wxDateTime::Gr_France_Lorraine));
+    PyDict_SetItemString(d,"DateTime_Gr_France_Strasbourg", SWIG_From_int((int)wxDateTime::Gr_France_Strasbourg));
+    PyDict_SetItemString(d,"DateTime_Gr_Germany", SWIG_From_int((int)wxDateTime::Gr_Germany));
+    PyDict_SetItemString(d,"DateTime_Gr_Germany_Catholic", SWIG_From_int((int)wxDateTime::Gr_Germany_Catholic));
+    PyDict_SetItemString(d,"DateTime_Gr_Germany_Prussia", SWIG_From_int((int)wxDateTime::Gr_Germany_Prussia));
+    PyDict_SetItemString(d,"DateTime_Gr_Germany_Protestant", SWIG_From_int((int)wxDateTime::Gr_Germany_Protestant));
+    PyDict_SetItemString(d,"DateTime_Gr_GreatBritain", SWIG_From_int((int)wxDateTime::Gr_GreatBritain));
+    PyDict_SetItemString(d,"DateTime_Gr_Greece", SWIG_From_int((int)wxDateTime::Gr_Greece));
+    PyDict_SetItemString(d,"DateTime_Gr_Hungary", SWIG_From_int((int)wxDateTime::Gr_Hungary));
+    PyDict_SetItemString(d,"DateTime_Gr_Ireland", SWIG_From_int((int)wxDateTime::Gr_Ireland));
+    PyDict_SetItemString(d,"DateTime_Gr_Italy", SWIG_From_int((int)wxDateTime::Gr_Italy));
+    PyDict_SetItemString(d,"DateTime_Gr_Japan", SWIG_From_int((int)wxDateTime::Gr_Japan));
+    PyDict_SetItemString(d,"DateTime_Gr_Japan_1", SWIG_From_int((int)wxDateTime::Gr_Japan_1));
+    PyDict_SetItemString(d,"DateTime_Gr_Japan_2", SWIG_From_int((int)wxDateTime::Gr_Japan_2));
+    PyDict_SetItemString(d,"DateTime_Gr_Japan_3", SWIG_From_int((int)wxDateTime::Gr_Japan_3));
+    PyDict_SetItemString(d,"DateTime_Gr_Latvia", SWIG_From_int((int)wxDateTime::Gr_Latvia));
+    PyDict_SetItemString(d,"DateTime_Gr_Lithuania", SWIG_From_int((int)wxDateTime::Gr_Lithuania));
+    PyDict_SetItemString(d,"DateTime_Gr_Luxemburg", SWIG_From_int((int)wxDateTime::Gr_Luxemburg));
+    PyDict_SetItemString(d,"DateTime_Gr_Netherlands", SWIG_From_int((int)wxDateTime::Gr_Netherlands));
+    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Groningen", SWIG_From_int((int)wxDateTime::Gr_Netherlands_Groningen));
+    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Gelderland", SWIG_From_int((int)wxDateTime::Gr_Netherlands_Gelderland));
+    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Utrecht", SWIG_From_int((int)wxDateTime::Gr_Netherlands_Utrecht));
+    PyDict_SetItemString(d,"DateTime_Gr_Netherlands_Friesland", SWIG_From_int((int)wxDateTime::Gr_Netherlands_Friesland));
+    PyDict_SetItemString(d,"DateTime_Gr_Norway", SWIG_From_int((int)wxDateTime::Gr_Norway));
+    PyDict_SetItemString(d,"DateTime_Gr_Poland", SWIG_From_int((int)wxDateTime::Gr_Poland));
+    PyDict_SetItemString(d,"DateTime_Gr_Portugal", SWIG_From_int((int)wxDateTime::Gr_Portugal));
+    PyDict_SetItemString(d,"DateTime_Gr_Romania", SWIG_From_int((int)wxDateTime::Gr_Romania));
+    PyDict_SetItemString(d,"DateTime_Gr_Russia", SWIG_From_int((int)wxDateTime::Gr_Russia));
+    PyDict_SetItemString(d,"DateTime_Gr_Scotland", SWIG_From_int((int)wxDateTime::Gr_Scotland));
+    PyDict_SetItemString(d,"DateTime_Gr_Spain", SWIG_From_int((int)wxDateTime::Gr_Spain));
+    PyDict_SetItemString(d,"DateTime_Gr_Sweden", SWIG_From_int((int)wxDateTime::Gr_Sweden));
+    PyDict_SetItemString(d,"DateTime_Gr_Switzerland", SWIG_From_int((int)wxDateTime::Gr_Switzerland));
+    PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Catholic", SWIG_From_int((int)wxDateTime::Gr_Switzerland_Catholic));
+    PyDict_SetItemString(d,"DateTime_Gr_Switzerland_Protestant", SWIG_From_int((int)wxDateTime::Gr_Switzerland_Protestant));
+    PyDict_SetItemString(d,"DateTime_Gr_Turkey", SWIG_From_int((int)wxDateTime::Gr_Turkey));
+    PyDict_SetItemString(d,"DateTime_Gr_USA", SWIG_From_int((int)wxDateTime::Gr_USA));
+    PyDict_SetItemString(d,"DateTime_Gr_Wales", SWIG_From_int((int)wxDateTime::Gr_Wales));
+    PyDict_SetItemString(d,"DateTime_Gr_Yugoslavia", SWIG_From_int((int)wxDateTime::Gr_Yugoslavia));
+    PyDict_SetItemString(d,"DateTime_Country_Unknown", SWIG_From_int((int)wxDateTime::Country_Unknown));
+    PyDict_SetItemString(d,"DateTime_Country_Default", SWIG_From_int((int)wxDateTime::Country_Default));
+    PyDict_SetItemString(d,"DateTime_Country_WesternEurope_Start", SWIG_From_int((int)wxDateTime::Country_WesternEurope_Start));
+    PyDict_SetItemString(d,"DateTime_Country_EEC", SWIG_From_int((int)wxDateTime::Country_EEC));
+    PyDict_SetItemString(d,"DateTime_France", SWIG_From_int((int)wxDateTime::France));
+    PyDict_SetItemString(d,"DateTime_Germany", SWIG_From_int((int)wxDateTime::Germany));
+    PyDict_SetItemString(d,"DateTime_UK", SWIG_From_int((int)wxDateTime::UK));
+    PyDict_SetItemString(d,"DateTime_Country_WesternEurope_End", SWIG_From_int((int)wxDateTime::Country_WesternEurope_End));
+    PyDict_SetItemString(d,"DateTime_Russia", SWIG_From_int((int)wxDateTime::Russia));
+    PyDict_SetItemString(d,"DateTime_USA", SWIG_From_int((int)wxDateTime::USA));
+    PyDict_SetItemString(d,"DateTime_Jan", SWIG_From_int((int)wxDateTime::Jan));
+    PyDict_SetItemString(d,"DateTime_Feb", SWIG_From_int((int)wxDateTime::Feb));
+    PyDict_SetItemString(d,"DateTime_Mar", SWIG_From_int((int)wxDateTime::Mar));
+    PyDict_SetItemString(d,"DateTime_Apr", SWIG_From_int((int)wxDateTime::Apr));
+    PyDict_SetItemString(d,"DateTime_May", SWIG_From_int((int)wxDateTime::May));
+    PyDict_SetItemString(d,"DateTime_Jun", SWIG_From_int((int)wxDateTime::Jun));
+    PyDict_SetItemString(d,"DateTime_Jul", SWIG_From_int((int)wxDateTime::Jul));
+    PyDict_SetItemString(d,"DateTime_Aug", SWIG_From_int((int)wxDateTime::Aug));
+    PyDict_SetItemString(d,"DateTime_Sep", SWIG_From_int((int)wxDateTime::Sep));
+    PyDict_SetItemString(d,"DateTime_Oct", SWIG_From_int((int)wxDateTime::Oct));
+    PyDict_SetItemString(d,"DateTime_Nov", SWIG_From_int((int)wxDateTime::Nov));
+    PyDict_SetItemString(d,"DateTime_Dec", SWIG_From_int((int)wxDateTime::Dec));
+    PyDict_SetItemString(d,"DateTime_Inv_Month", SWIG_From_int((int)wxDateTime::Inv_Month));
+    PyDict_SetItemString(d,"DateTime_Sun", SWIG_From_int((int)wxDateTime::Sun));
+    PyDict_SetItemString(d,"DateTime_Mon", SWIG_From_int((int)wxDateTime::Mon));
+    PyDict_SetItemString(d,"DateTime_Tue", SWIG_From_int((int)wxDateTime::Tue));
+    PyDict_SetItemString(d,"DateTime_Wed", SWIG_From_int((int)wxDateTime::Wed));
+    PyDict_SetItemString(d,"DateTime_Thu", SWIG_From_int((int)wxDateTime::Thu));
+    PyDict_SetItemString(d,"DateTime_Fri", SWIG_From_int((int)wxDateTime::Fri));
+    PyDict_SetItemString(d,"DateTime_Sat", SWIG_From_int((int)wxDateTime::Sat));
+    PyDict_SetItemString(d,"DateTime_Inv_WeekDay", SWIG_From_int((int)wxDateTime::Inv_WeekDay));
+    PyDict_SetItemString(d,"DateTime_Inv_Year", SWIG_From_int((int)wxDateTime::Inv_Year));
+    PyDict_SetItemString(d,"DateTime_Name_Full", SWIG_From_int((int)wxDateTime::Name_Full));
+    PyDict_SetItemString(d,"DateTime_Name_Abbr", SWIG_From_int((int)wxDateTime::Name_Abbr));
+    PyDict_SetItemString(d,"DateTime_Default_First", SWIG_From_int((int)wxDateTime::Default_First));
+    PyDict_SetItemString(d,"DateTime_Monday_First", SWIG_From_int((int)wxDateTime::Monday_First));
+    PyDict_SetItemString(d,"DateTime_Sunday_First", SWIG_From_int((int)wxDateTime::Sunday_First));
     SWIG_addvarlink(SWIG_globals,(char*)"DefaultDateTime",_wrap_DefaultDateTime_get, _wrap_DefaultDateTime_set);
-    PyDict_SetItemString(d,"DF_INVALID", SWIG_FromInt((int)wxDF_INVALID));
-    PyDict_SetItemString(d,"DF_TEXT", SWIG_FromInt((int)wxDF_TEXT));
-    PyDict_SetItemString(d,"DF_BITMAP", SWIG_FromInt((int)wxDF_BITMAP));
-    PyDict_SetItemString(d,"DF_METAFILE", SWIG_FromInt((int)wxDF_METAFILE));
-    PyDict_SetItemString(d,"DF_SYLK", SWIG_FromInt((int)wxDF_SYLK));
-    PyDict_SetItemString(d,"DF_DIF", SWIG_FromInt((int)wxDF_DIF));
-    PyDict_SetItemString(d,"DF_TIFF", SWIG_FromInt((int)wxDF_TIFF));
-    PyDict_SetItemString(d,"DF_OEMTEXT", SWIG_FromInt((int)wxDF_OEMTEXT));
-    PyDict_SetItemString(d,"DF_DIB", SWIG_FromInt((int)wxDF_DIB));
-    PyDict_SetItemString(d,"DF_PALETTE", SWIG_FromInt((int)wxDF_PALETTE));
-    PyDict_SetItemString(d,"DF_PENDATA", SWIG_FromInt((int)wxDF_PENDATA));
-    PyDict_SetItemString(d,"DF_RIFF", SWIG_FromInt((int)wxDF_RIFF));
-    PyDict_SetItemString(d,"DF_WAVE", SWIG_FromInt((int)wxDF_WAVE));
-    PyDict_SetItemString(d,"DF_UNICODETEXT", SWIG_FromInt((int)wxDF_UNICODETEXT));
-    PyDict_SetItemString(d,"DF_ENHMETAFILE", SWIG_FromInt((int)wxDF_ENHMETAFILE));
-    PyDict_SetItemString(d,"DF_FILENAME", SWIG_FromInt((int)wxDF_FILENAME));
-    PyDict_SetItemString(d,"DF_LOCALE", SWIG_FromInt((int)wxDF_LOCALE));
-    PyDict_SetItemString(d,"DF_PRIVATE", SWIG_FromInt((int)wxDF_PRIVATE));
-    PyDict_SetItemString(d,"DF_HTML", SWIG_FromInt((int)wxDF_HTML));
-    PyDict_SetItemString(d,"DF_MAX", SWIG_FromInt((int)wxDF_MAX));
+    PyDict_SetItemString(d,"DF_INVALID", SWIG_From_int((int)wxDF_INVALID));
+    PyDict_SetItemString(d,"DF_TEXT", SWIG_From_int((int)wxDF_TEXT));
+    PyDict_SetItemString(d,"DF_BITMAP", SWIG_From_int((int)wxDF_BITMAP));
+    PyDict_SetItemString(d,"DF_METAFILE", SWIG_From_int((int)wxDF_METAFILE));
+    PyDict_SetItemString(d,"DF_SYLK", SWIG_From_int((int)wxDF_SYLK));
+    PyDict_SetItemString(d,"DF_DIF", SWIG_From_int((int)wxDF_DIF));
+    PyDict_SetItemString(d,"DF_TIFF", SWIG_From_int((int)wxDF_TIFF));
+    PyDict_SetItemString(d,"DF_OEMTEXT", SWIG_From_int((int)wxDF_OEMTEXT));
+    PyDict_SetItemString(d,"DF_DIB", SWIG_From_int((int)wxDF_DIB));
+    PyDict_SetItemString(d,"DF_PALETTE", SWIG_From_int((int)wxDF_PALETTE));
+    PyDict_SetItemString(d,"DF_PENDATA", SWIG_From_int((int)wxDF_PENDATA));
+    PyDict_SetItemString(d,"DF_RIFF", SWIG_From_int((int)wxDF_RIFF));
+    PyDict_SetItemString(d,"DF_WAVE", SWIG_From_int((int)wxDF_WAVE));
+    PyDict_SetItemString(d,"DF_UNICODETEXT", SWIG_From_int((int)wxDF_UNICODETEXT));
+    PyDict_SetItemString(d,"DF_ENHMETAFILE", SWIG_From_int((int)wxDF_ENHMETAFILE));
+    PyDict_SetItemString(d,"DF_FILENAME", SWIG_From_int((int)wxDF_FILENAME));
+    PyDict_SetItemString(d,"DF_LOCALE", SWIG_From_int((int)wxDF_LOCALE));
+    PyDict_SetItemString(d,"DF_PRIVATE", SWIG_From_int((int)wxDF_PRIVATE));
+    PyDict_SetItemString(d,"DF_HTML", SWIG_From_int((int)wxDF_HTML));
+    PyDict_SetItemString(d,"DF_MAX", SWIG_From_int((int)wxDF_MAX));
     SWIG_addvarlink(SWIG_globals,(char*)"FormatInvalid",_wrap_FormatInvalid_get, _wrap_FormatInvalid_set);
-    PyDict_SetItemString(d,"DataObject_Get", SWIG_FromInt((int)wxDataObject::Get));
-    PyDict_SetItemString(d,"DataObject_Set", SWIG_FromInt((int)wxDataObject::Set));
-    PyDict_SetItemString(d,"DataObject_Both", SWIG_FromInt((int)wxDataObject::Both));
-    PyDict_SetItemString(d,"Drag_CopyOnly", SWIG_FromInt((int)wxDrag_CopyOnly));
-    PyDict_SetItemString(d,"Drag_AllowMove", SWIG_FromInt((int)wxDrag_AllowMove));
-    PyDict_SetItemString(d,"Drag_DefaultMove", SWIG_FromInt((int)wxDrag_DefaultMove));
-    PyDict_SetItemString(d,"DragError", SWIG_FromInt((int)wxDragError));
-    PyDict_SetItemString(d,"DragNone", SWIG_FromInt((int)wxDragNone));
-    PyDict_SetItemString(d,"DragCopy", SWIG_FromInt((int)wxDragCopy));
-    PyDict_SetItemString(d,"DragMove", SWIG_FromInt((int)wxDragMove));
-    PyDict_SetItemString(d,"DragLink", SWIG_FromInt((int)wxDragLink));
-    PyDict_SetItemString(d,"DragCancel", SWIG_FromInt((int)wxDragCancel));
+    PyDict_SetItemString(d,"DataObject_Get", SWIG_From_int((int)wxDataObject::Get));
+    PyDict_SetItemString(d,"DataObject_Set", SWIG_From_int((int)wxDataObject::Set));
+    PyDict_SetItemString(d,"DataObject_Both", SWIG_From_int((int)wxDataObject::Both));
+    PyDict_SetItemString(d,"Drag_CopyOnly", SWIG_From_int((int)wxDrag_CopyOnly));
+    PyDict_SetItemString(d,"Drag_AllowMove", SWIG_From_int((int)wxDrag_AllowMove));
+    PyDict_SetItemString(d,"Drag_DefaultMove", SWIG_From_int((int)wxDrag_DefaultMove));
+    PyDict_SetItemString(d,"DragError", SWIG_From_int((int)wxDragError));
+    PyDict_SetItemString(d,"DragNone", SWIG_From_int((int)wxDragNone));
+    PyDict_SetItemString(d,"DragCopy", SWIG_From_int((int)wxDragCopy));
+    PyDict_SetItemString(d,"DragMove", SWIG_From_int((int)wxDragMove));
+    PyDict_SetItemString(d,"DragLink", SWIG_From_int((int)wxDragLink));
+    PyDict_SetItemString(d,"DragCancel", SWIG_From_int((int)wxDragCancel));
     
     wxPyPtrTypeMap_Add("wxDropSource",     "wxPyDropSource");
     wxPyPtrTypeMap_Add("wxDropTarget",     "wxPyDropTarget");

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index 42e5e3c1a5fa6fe67d320662bb08433585894bf5..961a3a49cafedf0643812959863d69fd9ca7f143 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -305,6 +305,8 @@ FULLSCREEN_NOBORDER = _windows_.FULLSCREEN_NOBORDER
 FULLSCREEN_NOCAPTION = _windows_.FULLSCREEN_NOCAPTION
 FULLSCREEN_ALL = _windows_.FULLSCREEN_ALL
 TOPLEVEL_EX_DIALOG = _windows_.TOPLEVEL_EX_DIALOG
+USER_ATTENTION_INFO = _windows_.USER_ATTENTION_INFO
+USER_ATTENTION_ERROR = _windows_.USER_ATTENTION_ERROR
 class TopLevelWindow(_core.Window):
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
@@ -369,6 +371,10 @@ class TopLevelWindow(_core.Window):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
 
+    def RequestUserAttention(*args, **kwargs):
+        """RequestUserAttention(self, int flags=USER_ATTENTION_INFO)"""
+        return _windows_.TopLevelWindow_RequestUserAttention(*args, **kwargs)
+
     def MacSetMetalAppearance(*args, **kwargs):
         """MacSetMetalAppearance(self, bool on)"""
         return _windows_.TopLevelWindow_MacSetMetalAppearance(*args, **kwargs)

diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp
index 56cb36ccb4cbaecaf20e842d21f378285e31d783..baf2ef53f253008225625466f0523487b7178d14 100644 (file)
--- a/wxPython/src/mac/_windows_wrap.cpp
+++ b/wxPython/src/mac/_windows_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[0] 
@@ -304,47 +306,64 @@ static swig_type_info *swig_types[87];
 
 #define SWIG_name    "_windows_"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -359,119 +378,184 @@ static swig_type_info *swig_types[87];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
     return 1;
   }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
+}
+
+
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
+{
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
+  }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -484,31 +568,45 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckDouble(PyObject* obj)
+SWIGSTATICINLINE(double)
+SWIG_As_double(PyObject* obj)
 {
-  SWIG_AsDouble(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(double));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
 }
 
  static const wxString wxPyFrameNameStr(wxFrameNameStr); 
@@ -628,40 +726,50 @@ IMP_PYCALLBACK_VOID_SIZETSIZET_const(wxPyVScrolledWindow, wxVScrolledWindow, OnG
 IMP_PYCALLBACK_COORD_const          (wxPyVScrolledWindow, wxVScrolledWindow, EstimateTotalHeight);
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  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");
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
     }
-    return i;
-  }
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
 
@@ -1331,7 +1439,7 @@ IMP_PYCALLBACK_VOID_INT(wxPyPreviewControlBar, wxPreviewControlBar, SetZoomContr
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Panel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -1360,7 +1468,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1376,7 +1484,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -1409,7 +1517,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePanel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPanel *result;
     char *kwnames[] = {
@@ -1432,7 +1540,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Panel_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPanel *arg1 = (wxPanel *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1465,7 +1573,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -1481,7 +1589,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1515,7 +1623,7 @@ static PyObject *_wrap_Panel_Create(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Panel_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Panel_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPanel *arg1 = (wxPanel *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1540,7 +1648,7 @@ static PyObject *_wrap_Panel_InitDialog(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Panel_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Panel_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -1551,7 +1659,7 @@ static PyObject *_wrap_Panel_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Panel_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1573,14 +1681,14 @@ static PyObject *_wrap_Panel_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Panel_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Panel_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPanel, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -1609,7 +1717,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1625,7 +1733,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -1658,7 +1766,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *result;
     char *kwnames[] = {
@@ -1681,7 +1789,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1714,7 +1822,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -1730,7 +1838,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1764,7 +1872,7 @@ static PyObject *_wrap_ScrolledWindow_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -1789,24 +1897,24 @@ static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOO:ScrolledWindow_SetScrollbars",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (bool) SWIG_AsBool(obj7); 
+        arg8 = (bool)SWIG_As_bool(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1823,7 +1931,7 @@ static PyObject *_wrap_ScrolledWindow_SetScrollbars(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -1838,9 +1946,9 @@ static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_Scroll",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1856,7 +1964,7 @@ static PyObject *_wrap_ScrolledWindow_Scroll(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -1870,7 +1978,7 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ScrolledWindow_GetScrollPageSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1879,14 +1987,14 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPageSize(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -1901,9 +2009,9 @@ static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollPageSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1919,7 +2027,7 @@ static PyObject *_wrap_ScrolledWindow_SetScrollPageSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -1934,9 +2042,9 @@ static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScrollRate",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1952,20 +2060,22 @@ static PyObject *_wrap_ScrolledWindow_SetScrollRate(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetScrollPixelsPerUnit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrolledWindow_GetScrollPixelsPerUnit",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1977,21 +2087,17 @@ static PyObject *_wrap_ScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, PyO
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     bool arg2 ;
@@ -2006,9 +2112,9 @@ static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_EnableScrolling",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2024,20 +2130,22 @@ static PyObject *_wrap_ScrolledWindow_EnableScrolling(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetViewStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetViewStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ScrolledWindow_GetViewStart",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -2049,21 +2157,17 @@ static PyObject *_wrap_ScrolledWindow_GetViewStart(PyObject *self, PyObject *arg
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     double arg2 ;
@@ -2078,9 +2182,9 @@ static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ScrolledWindow_SetScale",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2096,7 +2200,7 @@ static PyObject *_wrap_ScrolledWindow_SetScale(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetScaleX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetScaleX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     double result;
@@ -2115,14 +2219,14 @@ static PyObject *_wrap_ScrolledWindow_GetScaleX(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     double result;
@@ -2141,14 +2245,14 @@ static PyObject *_wrap_ScrolledWindow_GetScaleY(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -2182,7 +2286,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_0(PyObject *sel
 }
 
 
-static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -2190,19 +2294,21 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *sel
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcScrolledPosition",&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2212,14 +2318,10 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(PyObject *sel
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
@@ -2267,9 +2369,9 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj
             }
         }
         if (_v) {
-            _v = SWIG_CheckInt(argv[1]);
+            _v = SWIG_Check_int(argv[1]);
             if (_v) {
-                _v = SWIG_CheckInt(argv[2]);
+                _v = SWIG_Check_int(argv[2]);
                 if (_v) {
                     return _wrap_ScrolledWindow_CalcScrolledPosition__SWIG_1(self,args);
                 }
@@ -2282,7 +2384,7 @@ static PyObject *_wrap_ScrolledWindow_CalcScrolledPosition(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -2316,7 +2418,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_0(PyObject *s
 }
 
 
-static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     int arg2 ;
@@ -2324,19 +2426,21 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *s
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTuple(args,(char *)"OOO:ScrolledWindow_CalcUnscrolledPosition",&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2346,14 +2450,10 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(PyObject *s
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
@@ -2401,9 +2501,9 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO
             }
         }
         if (_v) {
-            _v = SWIG_CheckInt(argv[1]);
+            _v = SWIG_Check_int(argv[1]);
             if (_v) {
-                _v = SWIG_CheckInt(argv[2]);
+                _v = SWIG_Check_int(argv[2]);
                 if (_v) {
                     return _wrap_ScrolledWindow_CalcUnscrolledPosition__SWIG_1(self,args);
                 }
@@ -2416,7 +2516,7 @@ static PyObject *_wrap_ScrolledWindow_CalcUnscrolledPosition(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_ScrolledWindow_AdjustScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_AdjustScrollbars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2441,7 +2541,7 @@ static PyObject *_wrap_ScrolledWindow_AdjustScrollbars(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_ScrolledWindow_CalcScrollInc(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_CalcScrollInc(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxScrollWinEvent *arg2 = 0 ;
@@ -2469,14 +2569,14 @@ static PyObject *_wrap_ScrolledWindow_CalcScrollInc(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_ScrolledWindow_SetTargetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_SetTargetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -2505,7 +2605,7 @@ static PyObject *_wrap_ScrolledWindow_SetTargetWindow(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetTargetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetTargetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxWindow *result;
@@ -2533,7 +2633,7 @@ static PyObject *_wrap_ScrolledWindow_GetTargetWindow(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_ScrolledWindow_SetTargetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_SetTargetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -2565,7 +2665,7 @@ static PyObject *_wrap_ScrolledWindow_SetTargetRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetTargetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetTargetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxRect result;
@@ -2595,7 +2695,7 @@ static PyObject *_wrap_ScrolledWindow_GetTargetRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_ScrolledWindow_DoPrepareDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_DoPrepareDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxScrolledWindow *arg1 = (wxScrolledWindow *) 0 ;
     wxDC *arg2 = 0 ;
@@ -2629,7 +2729,7 @@ static PyObject *_wrap_ScrolledWindow_DoPrepareDC(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ScrolledWindow_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ScrolledWindow_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -2640,7 +2740,7 @@ static PyObject *_wrap_ScrolledWindow_GetClassDefaultAttributes(PyObject *self,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:ScrolledWindow_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2662,14 +2762,14 @@ static PyObject *_wrap_ScrolledWindow_GetClassDefaultAttributes(PyObject *self,
 }
 
 
-static PyObject * ScrolledWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ScrolledWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxScrolledWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_FrameNameStr_set(PyObject *_val) {
+static int _wrap_FrameNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FrameNameStr is read-only.");
     return 1;
 }
@@ -2689,7 +2789,7 @@ static PyObject *_wrap_FrameNameStr_get() {
 }
 
 
-static int _wrap_DialogNameStr_set(PyObject *_val) {
+static int _wrap_DialogNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DialogNameStr is read-only.");
     return 1;
 }
@@ -2709,7 +2809,7 @@ static PyObject *_wrap_DialogNameStr_get() {
 }
 
 
-static int _wrap_StatusLineNameStr_set(PyObject *_val) {
+static int _wrap_StatusLineNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable StatusLineNameStr is read-only.");
     return 1;
 }
@@ -2729,7 +2829,7 @@ static PyObject *_wrap_StatusLineNameStr_get() {
 }
 
 
-static int _wrap_ToolBarNameStr_set(PyObject *_val) {
+static int _wrap_ToolBarNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable ToolBarNameStr is read-only.");
     return 1;
 }
@@ -2749,7 +2849,7 @@ static PyObject *_wrap_ToolBarNameStr_get() {
 }
 
 
-static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -2763,7 +2863,7 @@ static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2780,7 +2880,7 @@ static PyObject *_wrap_TopLevelWindow_Maximize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TopLevelWindow_Restore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_Restore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2805,7 +2905,7 @@ static PyObject *_wrap_TopLevelWindow_Restore(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool arg2 = (bool) True ;
@@ -2819,7 +2919,7 @@ static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2836,7 +2936,7 @@ static PyObject *_wrap_TopLevelWindow_Iconize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool result;
@@ -2864,7 +2964,7 @@ static PyObject *_wrap_TopLevelWindow_IsMaximized(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool result;
@@ -2892,7 +2992,7 @@ static PyObject *_wrap_TopLevelWindow_IsIconized(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TopLevelWindow_GetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_GetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxIcon result;
@@ -2922,7 +3022,7 @@ static PyObject *_wrap_TopLevelWindow_GetIcon(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TopLevelWindow_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_SetIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxIcon *arg2 = 0 ;
@@ -2956,7 +3056,7 @@ static PyObject *_wrap_TopLevelWindow_SetIcon(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_TopLevelWindow_SetIcons(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_SetIcons(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxIconBundle *arg2 = 0 ;
@@ -2990,7 +3090,7 @@ static PyObject *_wrap_TopLevelWindow_SetIcons(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool arg2 ;
@@ -3006,10 +3106,10 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TopLevelWindow_ShowFullScreen",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3028,7 +3128,7 @@ static PyObject *_wrap_TopLevelWindow_ShowFullScreen(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool result;
@@ -3056,7 +3156,7 @@ static PyObject *_wrap_TopLevelWindow_IsFullScreen(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -3097,7 +3197,7 @@ static PyObject *_wrap_TopLevelWindow_SetTitle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TopLevelWindow_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxString result;
@@ -3129,7 +3229,7 @@ static PyObject *_wrap_TopLevelWindow_GetTitle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     wxRegion *arg2 = 0 ;
@@ -3166,7 +3266,38 @@ static PyObject *_wrap_TopLevelWindow_SetShape(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_TopLevelWindow_MacSetMetalAppearance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_RequestUserAttention(PyObject *, PyObject *args, PyObject *kwargs) {
+    PyObject *resultobj;
+    wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
+    int arg2 = (int) wxUSER_ATTENTION_INFO ;
+    PyObject * obj0 = 0 ;
+    PyObject * obj1 = 0 ;
+    char *kwnames[] = {
+        (char *) "self",(char *) "flags", NULL 
+    };
+    
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:TopLevelWindow_RequestUserAttention",kwnames,&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow,
+    SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
+    if (obj1) {
+        arg2 = (int)SWIG_As_int(obj1); 
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    {
+        PyThreadState* __tstate = wxPyBeginAllowThreads();
+        (arg1)->RequestUserAttention(arg2);
+        
+        wxPyEndAllowThreads(__tstate);
+        if (PyErr_Occurred()) SWIG_fail;
+    }
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_TopLevelWindow_MacSetMetalAppearance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool arg2 ;
@@ -3179,7 +3310,7 @@ static PyObject *_wrap_TopLevelWindow_MacSetMetalAppearance(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TopLevelWindow_MacSetMetalAppearance",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxTopLevelWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3195,7 +3326,7 @@ static PyObject *_wrap_TopLevelWindow_MacSetMetalAppearance(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_TopLevelWindow_MacGetMetalAppearance(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TopLevelWindow_MacGetMetalAppearance(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTopLevelWindow *arg1 = (wxTopLevelWindow *) 0 ;
     bool result;
@@ -3223,14 +3354,14 @@ static PyObject *_wrap_TopLevelWindow_MacGetMetalAppearance(PyObject *self, PyOb
 }
 
 
-static PyObject * TopLevelWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TopLevelWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTopLevelWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Frame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -3263,7 +3394,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -3286,7 +3417,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -3327,7 +3458,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
 }
 
 
-static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *result;
     char *kwnames[] = {
@@ -3350,7 +3481,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -3387,7 +3518,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -3410,7 +3541,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -3452,7 +3583,7 @@ static PyObject *_wrap_Frame_Create(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Frame_GetClientAreaOrigin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_GetClientAreaOrigin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxPoint result;
@@ -3482,7 +3613,7 @@ static PyObject *_wrap_Frame_GetClientAreaOrigin(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Frame_SendSizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SendSizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3507,7 +3638,7 @@ static PyObject *_wrap_Frame_SendSizeEvent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Frame_SetMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SetMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxMenuBar *arg2 = (wxMenuBar *) 0 ;
@@ -3536,7 +3667,7 @@ static PyObject *_wrap_Frame_SetMenuBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Frame_GetMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_GetMenuBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxMenuBar *result;
@@ -3564,7 +3695,7 @@ static PyObject *_wrap_Frame_GetMenuBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_ProcessCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     int arg2 ;
@@ -3578,7 +3709,7 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_ProcessCommand",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3596,7 +3727,7 @@ static PyObject *_wrap_Frame_ProcessCommand(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_CreateStatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     int arg2 = (int) 1 ;
@@ -3619,15 +3750,15 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -3661,7 +3792,7 @@ static PyObject *_wrap_Frame_CreateStatusBar(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Frame_GetStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_GetStatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxStatusBar *result;
@@ -3689,7 +3820,7 @@ static PyObject *_wrap_Frame_GetStatusBar(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Frame_SetStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SetStatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxStatusBar *arg2 = (wxStatusBar *) 0 ;
@@ -3718,7 +3849,7 @@ static PyObject *_wrap_Frame_SetStatusBar(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SetStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -3740,7 +3871,7 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3765,7 +3896,7 @@ static PyObject *_wrap_Frame_SetStatusText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Frame_SetStatusWidths(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SetStatusWidths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     int arg2 ;
@@ -3804,7 +3935,7 @@ static PyObject *_wrap_Frame_SetStatusWidths(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_PushStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -3826,7 +3957,7 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3851,7 +3982,7 @@ static PyObject *_wrap_Frame_PushStatusText(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Frame_PopStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_PopStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     int arg2 = (int) 0 ;
@@ -3865,7 +3996,7 @@ static PyObject *_wrap_Frame_PopStatusText(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3882,7 +4013,7 @@ static PyObject *_wrap_Frame_PopStatusText(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     int arg2 ;
@@ -3895,7 +4026,7 @@ static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Frame_SetStatusBarPane",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3911,7 +4042,7 @@ static PyObject *_wrap_Frame_SetStatusBarPane(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Frame_GetStatusBarPane(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_GetStatusBarPane(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     int result;
@@ -3930,14 +4061,14 @@ static PyObject *_wrap_Frame_GetStatusBarPane(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_CreateToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     long arg2 = (long) -1 ;
@@ -3958,11 +4089,11 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -3996,7 +4127,7 @@ static PyObject *_wrap_Frame_CreateToolBar(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Frame_GetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_GetToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxToolBar *result;
@@ -4024,7 +4155,7 @@ static PyObject *_wrap_Frame_GetToolBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Frame_SetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_SetToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxToolBar *arg2 = (wxToolBar *) 0 ;
@@ -4053,7 +4184,7 @@ static PyObject *_wrap_Frame_SetToolBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_DoGiveHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -4074,7 +4205,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject
         if (arg2 == NULL) SWIG_fail;
         temp2 = True;
     }
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4098,7 +4229,7 @@ static PyObject *_wrap_Frame_DoGiveHelp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Frame_DoMenuUpdates(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_DoMenuUpdates(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFrame *arg1 = (wxFrame *) 0 ;
     wxMenu *arg2 = (wxMenu *) NULL ;
@@ -4129,7 +4260,7 @@ static PyObject *_wrap_Frame_DoMenuUpdates(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Frame_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Frame_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -4140,7 +4271,7 @@ static PyObject *_wrap_Frame_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Frame_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4162,14 +4293,14 @@ static PyObject *_wrap_Frame_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Frame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Frame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Dialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -4202,7 +4333,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -4225,7 +4356,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -4266,7 +4397,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *result;
     char *kwnames[] = {
@@ -4289,7 +4420,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -4326,7 +4457,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -4349,7 +4480,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -4391,7 +4522,7 @@ static PyObject *_wrap_Dialog_Create(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Dialog_SetReturnCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_SetReturnCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     int arg2 ;
@@ -4404,7 +4535,7 @@ static PyObject *_wrap_Dialog_SetReturnCode(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetReturnCode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4420,7 +4551,7 @@ static PyObject *_wrap_Dialog_SetReturnCode(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Dialog_GetReturnCode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_GetReturnCode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     int result;
@@ -4439,14 +4570,14 @@ static PyObject *_wrap_Dialog_GetReturnCode(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -4490,7 +4621,7 @@ static PyObject *_wrap_Dialog_CreateTextSizer(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     long arg2 ;
@@ -4504,7 +4635,7 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_CreateButtonSizer",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4522,7 +4653,7 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_IsModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     bool result;
@@ -4550,7 +4681,7 @@ static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Dialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_ShowModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     int result;
@@ -4569,14 +4700,14 @@ static PyObject *_wrap_Dialog_ShowModal(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Dialog_EndModal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_EndModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDialog *arg1 = (wxDialog *) 0 ;
     int arg2 ;
@@ -4589,7 +4720,7 @@ static PyObject *_wrap_Dialog_EndModal(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_EndModal",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4605,7 +4736,7 @@ static PyObject *_wrap_Dialog_EndModal(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Dialog_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Dialog_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -4616,7 +4747,7 @@ static PyObject *_wrap_Dialog_GetClassDefaultAttributes(PyObject *self, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Dialog_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4638,14 +4769,14 @@ static PyObject *_wrap_Dialog_GetClassDefaultAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject * Dialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Dialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MiniFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -4678,7 +4809,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -4701,7 +4832,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -4742,7 +4873,7 @@ static PyObject *_wrap_new_MiniFrame(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_PreMiniFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreMiniFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMiniFrame *result;
     char *kwnames[] = {
@@ -4765,7 +4896,7 @@ static PyObject *_wrap_new_PreMiniFrame(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MiniFrame_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMiniFrame *arg1 = (wxMiniFrame *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -4802,7 +4933,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -4825,7 +4956,7 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -4867,14 +4998,14 @@ static PyObject *_wrap_MiniFrame_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * MiniFrame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MiniFrame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMiniFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SplashScreenWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -4907,7 +5038,7 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py
     }
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         {
@@ -4922,7 +5053,7 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4940,7 +5071,7 @@ static PyObject *_wrap_new_SplashScreenWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SplashScreenWindow_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplashScreenWindow_SetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplashScreenWindow *arg1 = (wxSplashScreenWindow *) 0 ;
     wxBitmap *arg2 = 0 ;
@@ -4974,7 +5105,7 @@ static PyObject *_wrap_SplashScreenWindow_SetBitmap(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_SplashScreenWindow_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplashScreenWindow_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplashScreenWindow *arg1 = (wxSplashScreenWindow *) 0 ;
     wxBitmap *result;
@@ -5006,14 +5137,14 @@ static PyObject *_wrap_SplashScreenWindow_GetBitmap(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * SplashScreenWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SplashScreenWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSplashScreenWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SplashScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxBitmap *arg1 = 0 ;
     long arg2 ;
@@ -5048,14 +5179,14 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -5071,7 +5202,7 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj7) {
-        arg8 = (long) SWIG_AsLong(obj7); 
+        arg8 = (long)SWIG_As_long(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5089,7 +5220,7 @@ static PyObject *_wrap_new_SplashScreen(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_SplashScreen_GetSplashStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplashScreen_GetSplashStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplashScreen *arg1 = (wxSplashScreen *) 0 ;
     long result;
@@ -5108,14 +5239,14 @@ static PyObject *_wrap_SplashScreen_GetSplashStyle(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplashScreen_GetSplashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplashScreen_GetSplashWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplashScreen *arg1 = (wxSplashScreen *) 0 ;
     wxSplashScreenWindow *result;
@@ -5141,7 +5272,7 @@ static PyObject *_wrap_SplashScreen_GetSplashWindow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_SplashScreen_GetTimeout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplashScreen_GetTimeout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplashScreen *arg1 = (wxSplashScreen *) 0 ;
     int result;
@@ -5160,21 +5291,21 @@ static PyObject *_wrap_SplashScreen_GetTimeout(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * SplashScreen_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SplashScreen_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSplashScreen, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_StatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -5195,11 +5326,11 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -5232,7 +5363,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreStatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *result;
     char *kwnames[] = {
@@ -5255,7 +5386,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5280,11 +5411,11 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (long) SWIG_AsLong(obj3); 
+        arg4 = (long)SWIG_As_long(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -5318,7 +5449,7 @@ static PyObject *_wrap_StatusBar_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 = (int) 1 ;
@@ -5332,7 +5463,7 @@ static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStatusBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5349,7 +5480,7 @@ static PyObject *_wrap_StatusBar_SetFieldsCount(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StatusBar_GetFieldsCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_GetFieldsCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int result;
@@ -5368,14 +5499,14 @@ static PyObject *_wrap_StatusBar_GetFieldsCount(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_SetStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     wxString *arg2 = 0 ;
@@ -5397,7 +5528,7 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5422,7 +5553,7 @@ static PyObject *_wrap_StatusBar_SetStatusText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StatusBar_GetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_GetStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 = (int) 0 ;
@@ -5437,7 +5568,7 @@ static PyObject *_wrap_StatusBar_GetStatusText(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStatusBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5460,7 +5591,7 @@ static PyObject *_wrap_StatusBar_GetStatusText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_PushStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     wxString *arg2 = 0 ;
@@ -5482,7 +5613,7 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args,
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5507,7 +5638,7 @@ static PyObject *_wrap_StatusBar_PushStatusText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StatusBar_PopStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_PopStatusText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 = (int) 0 ;
@@ -5521,7 +5652,7 @@ static PyObject *_wrap_StatusBar_PopStatusText(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStatusBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5538,7 +5669,7 @@ static PyObject *_wrap_StatusBar_PopStatusText(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_StatusBar_SetStatusWidths(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_SetStatusWidths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 ;
@@ -5577,7 +5708,7 @@ static PyObject *_wrap_StatusBar_SetStatusWidths(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StatusBar_SetStatusStyles(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_SetStatusStyles(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 ;
@@ -5616,7 +5747,7 @@ static PyObject *_wrap_StatusBar_SetStatusStyles(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 ;
@@ -5630,7 +5761,7 @@ static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_GetFieldRect",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStatusBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5650,7 +5781,7 @@ static PyObject *_wrap_StatusBar_GetFieldRect(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int arg2 ;
@@ -5663,7 +5794,7 @@ static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StatusBar_SetMinHeight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxStatusBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5679,7 +5810,7 @@ static PyObject *_wrap_StatusBar_SetMinHeight(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_StatusBar_GetBorderX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_GetBorderX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int result;
@@ -5698,14 +5829,14 @@ static PyObject *_wrap_StatusBar_GetBorderX(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StatusBar_GetBorderY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_GetBorderY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxStatusBar *arg1 = (wxStatusBar *) 0 ;
     int result;
@@ -5724,14 +5855,14 @@ static PyObject *_wrap_StatusBar_GetBorderY(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_StatusBar_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_StatusBar_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -5742,7 +5873,7 @@ static PyObject *_wrap_StatusBar_GetClassDefaultAttributes(PyObject *self, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:StatusBar_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5764,14 +5895,14 @@ static PyObject *_wrap_StatusBar_GetClassDefaultAttributes(PyObject *self, PyObj
 }
 
 
-static PyObject * StatusBar_swigregister(PyObject *self, PyObject *args) {
+static PyObject * StatusBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxStatusBar, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_SplitterNameStr_set(PyObject *_val) {
+static int _wrap_SplitterNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SplitterNameStr is read-only.");
     return 1;
 }
@@ -5791,7 +5922,7 @@ static PyObject *_wrap_SplitterNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SplitterWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -5820,7 +5951,7 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -5836,7 +5967,7 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -5869,7 +6000,7 @@ static PyObject *_wrap_new_SplitterWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_PreSplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSplitterWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *result;
     char *kwnames[] = {
@@ -5892,7 +6023,7 @@ static PyObject *_wrap_new_PreSplitterWindow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5925,7 +6056,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -5941,7 +6072,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -5975,7 +6106,7 @@ static PyObject *_wrap_SplitterWindow_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetWindow1(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetWindow1(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *result;
@@ -6003,7 +6134,7 @@ static PyObject *_wrap_SplitterWindow_GetWindow1(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetWindow2(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetWindow2(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *result;
@@ -6031,7 +6162,7 @@ static PyObject *_wrap_SplitterWindow_GetWindow2(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
@@ -6044,7 +6175,7 @@ static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSplitMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6060,7 +6191,7 @@ static PyObject *_wrap_SplitterWindow_SetSplitMode(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetSplitMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetSplitMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int result;
@@ -6079,14 +6210,14 @@ static PyObject *_wrap_SplitterWindow_GetSplitMode(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterWindow_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_Initialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -6115,7 +6246,7 @@ static PyObject *_wrap_SplitterWindow_Initialize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -6138,7 +6269,7 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject *
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6157,7 +6288,7 @@ static PyObject *_wrap_SplitterWindow_SplitVertically(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -6180,7 +6311,7 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6199,7 +6330,7 @@ static PyObject *_wrap_SplitterWindow_SplitHorizontally(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) NULL ;
@@ -6233,7 +6364,7 @@ static PyObject *_wrap_SplitterWindow_Unsplit(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -6269,7 +6400,7 @@ static PyObject *_wrap_SplitterWindow_ReplaceWindow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_SplitterWindow_UpdateSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_UpdateSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6294,7 +6425,7 @@ static PyObject *_wrap_SplitterWindow_UpdateSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     bool result;
@@ -6322,7 +6453,7 @@ static PyObject *_wrap_SplitterWindow_IsSplit(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
@@ -6335,7 +6466,7 @@ static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetSashSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6351,7 +6482,7 @@ static PyObject *_wrap_SplitterWindow_SetSashSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
@@ -6364,7 +6495,7 @@ static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetBorderSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6380,7 +6511,7 @@ static PyObject *_wrap_SplitterWindow_SetBorderSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetSashSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetSashSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int result;
@@ -6399,14 +6530,14 @@ static PyObject *_wrap_SplitterWindow_GetSashSize(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetBorderSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int result;
@@ -6425,14 +6556,14 @@ static PyObject *_wrap_SplitterWindow_GetBorderSize(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
@@ -6447,10 +6578,10 @@ static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:SplitterWindow_SetSashPosition",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6467,7 +6598,7 @@ static PyObject *_wrap_SplitterWindow_SetSashPosition(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetSashPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int result;
@@ -6486,14 +6617,14 @@ static PyObject *_wrap_SplitterWindow_GetSashPosition(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
@@ -6506,7 +6637,7 @@ static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetMinimumPaneSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6522,7 +6653,7 @@ static PyObject *_wrap_SplitterWindow_SetMinimumPaneSize(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetMinimumPaneSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetMinimumPaneSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int result;
@@ -6541,14 +6672,14 @@ static PyObject *_wrap_SplitterWindow_GetMinimumPaneSize(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     int arg2 ;
@@ -6566,12 +6697,12 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SplitterWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6590,7 +6721,7 @@ static PyObject *_wrap_SplitterWindow_SashHitTest(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SplitterWindow_SizeWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SizeWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6615,7 +6746,7 @@ static PyObject *_wrap_SplitterWindow_SizeWindows(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     bool arg2 ;
@@ -6628,7 +6759,7 @@ static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterWindow_SetNeedUpdating",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6644,7 +6775,7 @@ static PyObject *_wrap_SplitterWindow_SetNeedUpdating(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterWindow *arg1 = (wxSplitterWindow *) 0 ;
     bool result;
@@ -6672,7 +6803,7 @@ static PyObject *_wrap_SplitterWindow_GetNeedUpdating(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_SplitterWindow_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterWindow_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -6683,7 +6814,7 @@ static PyObject *_wrap_SplitterWindow_GetClassDefaultAttributes(PyObject *self,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:SplitterWindow_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6705,14 +6836,14 @@ static PyObject *_wrap_SplitterWindow_GetClassDefaultAttributes(PyObject *self,
 }
 
 
-static PyObject * SplitterWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SplitterWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSplitterWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SplitterEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SplitterEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     wxSplitterWindow *arg2 = (wxSplitterWindow *) (wxSplitterWindow *) NULL ;
@@ -6725,7 +6856,7 @@ static PyObject *_wrap_new_SplitterEvent(PyObject *self, PyObject *args, PyObjec
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SplitterEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
@@ -6746,7 +6877,7 @@ static PyObject *_wrap_new_SplitterEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ;
     int arg2 ;
@@ -6759,7 +6890,7 @@ static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SplitterEvent_SetSashPosition",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSplitterEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6775,7 +6906,7 @@ static PyObject *_wrap_SplitterEvent_SetSashPosition(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_SplitterEvent_GetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterEvent_GetSashPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ;
     int result;
@@ -6794,14 +6925,14 @@ static PyObject *_wrap_SplitterEvent_GetSashPosition(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterEvent_GetWindowBeingRemoved(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterEvent_GetWindowBeingRemoved(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ;
     wxWindow *result;
@@ -6829,7 +6960,7 @@ static PyObject *_wrap_SplitterEvent_GetWindowBeingRemoved(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_SplitterEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterEvent_GetX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ;
     int result;
@@ -6848,14 +6979,14 @@ static PyObject *_wrap_SplitterEvent_GetX(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SplitterEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SplitterEvent_GetY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSplitterEvent *arg1 = (wxSplitterEvent *) 0 ;
     int result;
@@ -6874,21 +7005,21 @@ static PyObject *_wrap_SplitterEvent_GetY(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * SplitterEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SplitterEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSplitterEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_SashNameStr_set(PyObject *_val) {
+static int _wrap_SashNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SashNameStr is read-only.");
     return 1;
 }
@@ -6908,7 +7039,7 @@ static PyObject *_wrap_SashNameStr_get() {
 }
 
 
-static int _wrap_SashLayoutNameStr_set(PyObject *_val) {
+static int _wrap_SashLayoutNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable SashLayoutNameStr is read-only.");
     return 1;
 }
@@ -6928,7 +7059,7 @@ static PyObject *_wrap_SashLayoutNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SashWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -6957,7 +7088,7 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -6973,7 +7104,7 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -7006,7 +7137,7 @@ static PyObject *_wrap_new_SashWindow(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_PreSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSashWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *result;
     char *kwnames[] = {
@@ -7029,7 +7160,7 @@ static PyObject *_wrap_new_PreSashWindow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -7062,7 +7193,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -7078,7 +7209,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -7112,7 +7243,7 @@ static PyObject *_wrap_SashWindow_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7127,9 +7258,9 @@ static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashVisible",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7145,7 +7276,7 @@ static PyObject *_wrap_SashWindow_SetSashVisible(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7159,7 +7290,7 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetSashVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7177,7 +7308,7 @@ static PyObject *_wrap_SashWindow_GetSashVisible(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7192,9 +7323,9 @@ static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SashWindow_SetSashBorder",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (bool) SWIG_AsBool(obj2); 
+    arg3 = (bool)SWIG_As_bool(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7210,7 +7341,7 @@ static PyObject *_wrap_SashWindow_SetSashBorder(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_HasBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7224,7 +7355,7 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_HasBorder",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7242,7 +7373,7 @@ static PyObject *_wrap_SashWindow_HasBorder(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7256,7 +7387,7 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_GetEdgeMargin",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7265,14 +7396,14 @@ static PyObject *_wrap_SashWindow_GetEdgeMargin(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7285,7 +7416,7 @@ static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetDefaultBorderSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7301,7 +7432,7 @@ static PyObject *_wrap_SashWindow_SetDefaultBorderSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_SashWindow_GetDefaultBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetDefaultBorderSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int result;
@@ -7320,14 +7451,14 @@ static PyObject *_wrap_SashWindow_GetDefaultBorderSize(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7340,7 +7471,7 @@ static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetExtraBorderSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7356,7 +7487,7 @@ static PyObject *_wrap_SashWindow_SetExtraBorderSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_SashWindow_GetExtraBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetExtraBorderSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int result;
@@ -7375,14 +7506,14 @@ static PyObject *_wrap_SashWindow_GetExtraBorderSize(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7395,7 +7526,7 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7411,7 +7542,7 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeX(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7424,7 +7555,7 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMinimumSizeY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7440,7 +7571,7 @@ static PyObject *_wrap_SashWindow_SetMinimumSizeY(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SashWindow_GetMinimumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetMinimumSizeX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int result;
@@ -7459,14 +7590,14 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeX(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_GetMinimumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetMinimumSizeY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int result;
@@ -7485,14 +7616,14 @@ static PyObject *_wrap_SashWindow_GetMinimumSizeY(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7505,7 +7636,7 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7521,7 +7652,7 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeX(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7534,7 +7665,7 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashWindow_SetMaximumSizeY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7550,7 +7681,7 @@ static PyObject *_wrap_SashWindow_SetMaximumSizeY(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_SashWindow_GetMaximumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetMaximumSizeX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int result;
@@ -7569,14 +7700,14 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeX(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_GetMaximumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_GetMaximumSizeY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int result;
@@ -7595,14 +7726,14 @@ static PyObject *_wrap_SashWindow_GetMaximumSizeY(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SashHitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     int arg2 ;
@@ -7620,12 +7751,12 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:SashWindow_SashHitTest",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7635,14 +7766,14 @@ static PyObject *_wrap_SashWindow_SashHitTest(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashWindow_SizeWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashWindow_SizeWindows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashWindow *arg1 = (wxSashWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7667,14 +7798,14 @@ static PyObject *_wrap_SashWindow_SizeWindows(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * SashWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SashWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSashWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SashEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SashEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) wxSASH_NONE ;
@@ -7687,11 +7818,11 @@ static PyObject *_wrap_new_SashEvent(PyObject *self, PyObject *args, PyObject *k
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_SashEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7708,7 +7839,7 @@ static PyObject *_wrap_new_SashEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_SashEvent_SetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashEvent_SetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashEvent *arg1 = (wxSashEvent *) 0 ;
     int arg2 ;
@@ -7721,7 +7852,7 @@ static PyObject *_wrap_SashEvent_SetEdge(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetEdge",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashEdgePosition) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7737,7 +7868,7 @@ static PyObject *_wrap_SashEvent_SetEdge(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_SashEvent_GetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashEvent_GetEdge(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashEvent *arg1 = (wxSashEvent *) 0 ;
     int result;
@@ -7756,14 +7887,14 @@ static PyObject *_wrap_SashEvent_GetEdge(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashEvent_SetDragRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashEvent_SetDragRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashEvent *arg1 = (wxSashEvent *) 0 ;
     wxRect *arg2 = 0 ;
@@ -7795,7 +7926,7 @@ static PyObject *_wrap_SashEvent_SetDragRect(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SashEvent_GetDragRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashEvent_GetDragRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashEvent *arg1 = (wxSashEvent *) 0 ;
     wxRect result;
@@ -7825,7 +7956,7 @@ static PyObject *_wrap_SashEvent_GetDragRect(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashEvent *arg1 = (wxSashEvent *) 0 ;
     int arg2 ;
@@ -7838,7 +7969,7 @@ static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashEvent_SetDragStatus",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxSashDragStatus) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7854,7 +7985,7 @@ static PyObject *_wrap_SashEvent_SetDragStatus(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SashEvent_GetDragStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashEvent_GetDragStatus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashEvent *arg1 = (wxSashEvent *) 0 ;
     int result;
@@ -7873,21 +8004,21 @@ static PyObject *_wrap_SashEvent_GetDragStatus(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * SashEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SashEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSashEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxQueryLayoutInfoEvent *result;
@@ -7898,7 +8029,7 @@ static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_QueryLayoutInfoEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7915,7 +8046,7 @@ static PyObject *_wrap_new_QueryLayoutInfoEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int arg2 ;
@@ -7928,7 +8059,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetRequestedLength",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryLayoutInfoEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7944,7 +8075,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetRequestedLength(PyObject *self, P
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_GetRequestedLength(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_GetRequestedLength(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int result;
@@ -7963,14 +8094,14 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetRequestedLength(PyObject *self, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int arg2 ;
@@ -7983,7 +8114,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryLayoutInfoEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7999,7 +8130,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int result;
@@ -8018,14 +8149,14 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     wxSize *arg2 = 0 ;
@@ -8057,7 +8188,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     wxSize result;
@@ -8087,7 +8218,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int arg2 ;
@@ -8100,7 +8231,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryLayoutInfoEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxLayoutOrientation) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8116,7 +8247,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int result;
@@ -8135,14 +8266,14 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int arg2 ;
@@ -8155,7 +8286,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:QueryLayoutInfoEvent_SetAlignment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxQueryLayoutInfoEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxLayoutAlignment) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8171,7 +8302,7 @@ static PyObject *_wrap_QueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_QueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_QueryLayoutInfoEvent_GetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxQueryLayoutInfoEvent *arg1 = (wxQueryLayoutInfoEvent *) 0 ;
     int result;
@@ -8190,21 +8321,21 @@ static PyObject *_wrap_QueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * QueryLayoutInfoEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * QueryLayoutInfoEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxQueryLayoutInfoEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxCalculateLayoutEvent *result;
@@ -8215,7 +8346,7 @@ static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_CalculateLayoutEvent",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8232,7 +8363,7 @@ static PyObject *_wrap_new_CalculateLayoutEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ;
     int arg2 ;
@@ -8245,7 +8376,7 @@ static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalculateLayoutEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalculateLayoutEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8261,7 +8392,7 @@ static PyObject *_wrap_CalculateLayoutEvent_SetFlags(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_CalculateLayoutEvent_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalculateLayoutEvent_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ;
     int result;
@@ -8280,14 +8411,14 @@ static PyObject *_wrap_CalculateLayoutEvent_GetFlags(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_CalculateLayoutEvent_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalculateLayoutEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ;
     wxRect *arg2 = 0 ;
@@ -8319,7 +8450,7 @@ static PyObject *_wrap_CalculateLayoutEvent_SetRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_CalculateLayoutEvent_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalculateLayoutEvent_GetRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalculateLayoutEvent *arg1 = (wxCalculateLayoutEvent *) 0 ;
     wxRect result;
@@ -8349,14 +8480,14 @@ static PyObject *_wrap_CalculateLayoutEvent_GetRect(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * CalculateLayoutEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalculateLayoutEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalculateLayoutEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SashLayoutWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -8385,7 +8516,7 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -8401,7 +8532,7 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -8434,7 +8565,7 @@ static PyObject *_wrap_new_SashLayoutWindow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_new_PreSashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreSashLayoutWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *result;
     char *kwnames[] = {
@@ -8457,7 +8588,7 @@ static PyObject *_wrap_new_PreSashLayoutWindow(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashLayoutWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -8490,7 +8621,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -8506,7 +8637,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -8540,7 +8671,7 @@ static PyObject *_wrap_SashLayoutWindow_Create(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_SashLayoutWindow_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashLayoutWindow_GetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     int result;
@@ -8559,14 +8690,14 @@ static PyObject *_wrap_SashLayoutWindow_GetAlignment(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashLayoutWindow_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashLayoutWindow_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     int result;
@@ -8585,14 +8716,14 @@ static PyObject *_wrap_SashLayoutWindow_GetOrientation(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     int arg2 ;
@@ -8605,7 +8736,7 @@ static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetAlignment",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashLayoutWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxLayoutAlignment) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8621,7 +8752,7 @@ static PyObject *_wrap_SashLayoutWindow_SetAlignment(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_SashLayoutWindow_SetDefaultSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashLayoutWindow_SetDefaultSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -8653,7 +8784,7 @@ static PyObject *_wrap_SashLayoutWindow_SetDefaultSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSashLayoutWindow *arg1 = (wxSashLayoutWindow *) 0 ;
     int arg2 ;
@@ -8666,7 +8797,7 @@ static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SashLayoutWindow_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSashLayoutWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxLayoutOrientation) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8682,14 +8813,14 @@ static PyObject *_wrap_SashLayoutWindow_SetOrientation(PyObject *self, PyObject
 }
 
 
-static PyObject * SashLayoutWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SashLayoutWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSashLayoutWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_LayoutAlgorithm(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_LayoutAlgorithm(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutAlgorithm *result;
     char *kwnames[] = {
@@ -8711,7 +8842,7 @@ static PyObject *_wrap_new_LayoutAlgorithm(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_delete_LayoutAlgorithm(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_LayoutAlgorithm(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutAlgorithm *arg1 = (wxLayoutAlgorithm *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8736,7 +8867,7 @@ static PyObject *_wrap_delete_LayoutAlgorithm(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutAlgorithm *arg1 = (wxLayoutAlgorithm *) 0 ;
     wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ;
@@ -8774,7 +8905,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutAlgorithm *arg1 = (wxLayoutAlgorithm *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -8812,7 +8943,7 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxLayoutAlgorithm *arg1 = (wxLayoutAlgorithm *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -8850,14 +8981,14 @@ static PyObject *_wrap_LayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * LayoutAlgorithm_swigregister(PyObject *self, PyObject *args) {
+static PyObject * LayoutAlgorithm_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxLayoutAlgorithm, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PopupWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PopupWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBORDER_NONE ;
@@ -8872,7 +9003,7 @@ static PyObject *_wrap_new_PopupWindow(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8889,7 +9020,7 @@ static PyObject *_wrap_new_PopupWindow(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PrePopupWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePopupWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPopupWindow *result;
     char *kwnames[] = {
@@ -8911,14 +9042,14 @@ static PyObject *_wrap_new_PrePopupWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * PopupWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PopupWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPopupWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PopupTransientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PopupTransientWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxBORDER_NONE ;
@@ -8933,7 +9064,7 @@ static PyObject *_wrap_new_PopupTransientWindow(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8950,7 +9081,7 @@ static PyObject *_wrap_new_PopupTransientWindow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_PrePopupTransientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePopupTransientWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPopupTransientWindow *result;
     char *kwnames[] = {
@@ -8972,14 +9103,14 @@ static PyObject *_wrap_new_PrePopupTransientWindow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * PopupTransientWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PopupTransientWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPopupTransientWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TipWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -9004,7 +9135,7 @@ static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *k
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -9034,7 +9165,7 @@ static PyObject *_wrap_new_TipWindow(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_TipWindow_SetBoundingRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TipWindow_SetBoundingRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTipWindow *arg1 = (wxTipWindow *) 0 ;
     wxRect *arg2 = 0 ;
@@ -9066,7 +9197,7 @@ static PyObject *_wrap_TipWindow_SetBoundingRect(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TipWindow_Close(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TipWindow_Close(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTipWindow *arg1 = (wxTipWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9091,14 +9222,14 @@ static PyObject *_wrap_TipWindow_Close(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * TipWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TipWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTipWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_VScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxID_ANY ;
@@ -9127,7 +9258,7 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -9143,7 +9274,7 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -9176,7 +9307,7 @@ static PyObject *_wrap_new_VScrolledWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_PreVScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreVScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *result;
     char *kwnames[] = {
@@ -9199,7 +9330,7 @@ static PyObject *_wrap_new_PreVScrolledWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_VScrolledWindow__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -9230,7 +9361,7 @@ static PyObject *_wrap_VScrolledWindow__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -9263,7 +9394,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -9279,7 +9410,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -9313,7 +9444,7 @@ static PyObject *_wrap_VScrolledWindow_Create(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t arg2 ;
@@ -9326,7 +9457,7 @@ static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_SetLineCount",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9342,7 +9473,7 @@ static PyObject *_wrap_VScrolledWindow_SetLineCount(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t arg2 ;
@@ -9356,7 +9487,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollToLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9374,7 +9505,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollToLine(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     int arg2 ;
@@ -9388,7 +9519,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollLines",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9406,7 +9537,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollLines(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     int arg2 ;
@@ -9420,7 +9551,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_ScrollPages",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9438,7 +9569,7 @@ static PyObject *_wrap_VScrolledWindow_ScrollPages(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t arg2 ;
@@ -9451,7 +9582,7 @@ static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_RefreshLine",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9467,7 +9598,7 @@ static PyObject *_wrap_VScrolledWindow_RefreshLine(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t arg2 ;
@@ -9482,9 +9613,9 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_RefreshLines",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+    arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9500,7 +9631,7 @@ static PyObject *_wrap_VScrolledWindow_RefreshLines(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_VScrolledWindow_HitTestXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_HitTestXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     int arg2 ;
@@ -9516,9 +9647,9 @@ static PyObject *_wrap_VScrolledWindow_HitTestXY(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VScrolledWindow_HitTestXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9527,14 +9658,14 @@ static PyObject *_wrap_VScrolledWindow_HitTestXY(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VScrolledWindow_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -9560,14 +9691,14 @@ static PyObject *_wrap_VScrolledWindow_HitTest(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VScrolledWindow_RefreshAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_RefreshAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9592,7 +9723,7 @@ static PyObject *_wrap_VScrolledWindow_RefreshAll(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t result;
@@ -9611,14 +9742,14 @@ static PyObject *_wrap_VScrolledWindow_GetLineCount(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t result;
@@ -9637,14 +9768,14 @@ static PyObject *_wrap_VScrolledWindow_GetFirstVisibleLine(PyObject *self, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t result;
@@ -9663,14 +9794,14 @@ static PyObject *_wrap_VScrolledWindow_GetLastVisibleLine(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVScrolledWindow *arg1 = (wxPyVScrolledWindow *) 0 ;
     size_t arg2 ;
@@ -9684,7 +9815,7 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VScrolledWindow_IsVisible",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9702,14 +9833,14 @@ static PyObject *_wrap_VScrolledWindow_IsVisible(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * VScrolledWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * VScrolledWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyVScrolledWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_VListBoxNameStr_set(PyObject *_val) {
+static int _wrap_VListBoxNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable VListBoxNameStr is read-only.");
     return 1;
 }
@@ -9729,7 +9860,7 @@ static PyObject *_wrap_VListBoxNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_VListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxID_ANY ;
@@ -9758,7 +9889,7 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -9774,7 +9905,7 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -9807,7 +9938,7 @@ static PyObject *_wrap_new_VListBox(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PreVListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreVListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *result;
     char *kwnames[] = {
@@ -9830,7 +9961,7 @@ static PyObject *_wrap_new_PreVListBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VListBox__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -9861,7 +9992,7 @@ static PyObject *_wrap_VListBox__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -9894,7 +10025,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -9910,7 +10041,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -9944,7 +10075,7 @@ static PyObject *_wrap_VListBox_Create(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VListBox_GetItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t result;
@@ -9963,14 +10094,14 @@ static PyObject *_wrap_VListBox_GetItemCount(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     bool result;
@@ -9998,7 +10129,7 @@ static PyObject *_wrap_VListBox_HasMultipleSelection(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_VListBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     int result;
@@ -10017,14 +10148,14 @@ static PyObject *_wrap_VListBox_GetSelection(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_IsCurrent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
@@ -10038,7 +10169,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsCurrent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10056,7 +10187,7 @@ static PyObject *_wrap_VListBox_IsCurrent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_IsSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
@@ -10070,7 +10201,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_IsSelected",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10088,7 +10219,7 @@ static PyObject *_wrap_VListBox_IsSelected(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_VListBox_GetSelectedCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetSelectedCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t result;
@@ -10107,14 +10238,14 @@ static PyObject *_wrap_VListBox_GetSelectedCount(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedLong((unsigned long)result);
+    resultobj = SWIG_From_unsigned_SS_long((unsigned long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_VListBox_GetFirstSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetFirstSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     PyObject *result;
@@ -10140,7 +10271,7 @@ static PyObject *_wrap_VListBox_GetFirstSelected(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_VListBox_GetNextSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetNextSelected(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     unsigned long arg2 ;
@@ -10154,7 +10285,7 @@ static PyObject *_wrap_VListBox_GetNextSelected(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_GetNextSelected",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (unsigned long)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10170,7 +10301,7 @@ static PyObject *_wrap_VListBox_GetNextSelected(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_VListBox_GetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     wxPoint result;
@@ -10200,7 +10331,7 @@ static PyObject *_wrap_VListBox_GetMargins(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_VListBox_GetSelectionBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_GetSelectionBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     wxColour *result;
@@ -10229,7 +10360,7 @@ static PyObject *_wrap_VListBox_GetSelectionBackground(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_VListBox_SetItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SetItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
@@ -10242,7 +10373,7 @@ static PyObject *_wrap_VListBox_SetItemCount(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10258,7 +10389,7 @@ static PyObject *_wrap_VListBox_SetItemCount(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_VListBox_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10283,7 +10414,7 @@ static PyObject *_wrap_VListBox_Clear(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_VListBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     int arg2 ;
@@ -10296,7 +10427,7 @@ static PyObject *_wrap_VListBox_SetSelection(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10312,7 +10443,7 @@ static PyObject *_wrap_VListBox_SetSelection(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_Select(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
@@ -10328,10 +10459,10 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:VListBox_Select",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10350,7 +10481,7 @@ static PyObject *_wrap_VListBox_Select(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SelectRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
@@ -10366,9 +10497,9 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SelectRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+    arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10386,7 +10517,7 @@ static PyObject *_wrap_VListBox_SelectRange(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_VListBox_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_Toggle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     size_t arg2 ;
@@ -10399,7 +10530,7 @@ static PyObject *_wrap_VListBox_Toggle(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:VListBox_Toggle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10415,7 +10546,7 @@ static PyObject *_wrap_VListBox_Toggle(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_VListBox_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     bool result;
@@ -10443,7 +10574,7 @@ static PyObject *_wrap_VListBox_SelectAll(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_VListBox_DeselectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_DeselectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     bool result;
@@ -10471,7 +10602,7 @@ static PyObject *_wrap_VListBox_DeselectAll(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_VListBox_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -10503,7 +10634,7 @@ static PyObject *_wrap_VListBox_SetMargins(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     int arg2 ;
@@ -10518,9 +10649,9 @@ static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:VListBox_SetMarginsXY",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyVListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10536,7 +10667,7 @@ static PyObject *_wrap_VListBox_SetMarginsXY(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_VListBox_SetSelectionBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_VListBox_SetSelectionBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyVListBox *arg1 = (wxPyVListBox *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10568,14 +10699,14 @@ static PyObject *_wrap_VListBox_SetSelectionBackground(PyObject *self, PyObject
 }
 
 
-static PyObject * VListBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * VListBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyVListBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) wxID_ANY ;
@@ -10604,7 +10735,7 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -10620,7 +10751,7 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -10653,7 +10784,7 @@ static PyObject *_wrap_new_HtmlListBox(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreHtmlListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreHtmlListBox(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlListBox *result;
     char *kwnames[] = {
@@ -10676,7 +10807,7 @@ static PyObject *_wrap_new_PreHtmlListBox(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlListBox__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlListBox__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -10707,7 +10838,7 @@ static PyObject *_wrap_HtmlListBox__setCallbackInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlListBox_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -10740,7 +10871,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -10756,7 +10887,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -10790,7 +10921,7 @@ static PyObject *_wrap_HtmlListBox_Create(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlListBox_RefreshAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlListBox_RefreshAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10815,7 +10946,7 @@ static PyObject *_wrap_HtmlListBox_RefreshAll(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
     size_t arg2 ;
@@ -10828,7 +10959,7 @@ static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlListBox_SetItemCount",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlListBox,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10844,7 +10975,7 @@ static PyObject *_wrap_HtmlListBox_SetItemCount(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlListBox_GetFileSystem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlListBox_GetFileSystem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
     wxFileSystem *result;
@@ -10873,14 +11004,14 @@ static PyObject *_wrap_HtmlListBox_GetFileSystem(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * HtmlListBox_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlListBox_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlListBox, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TaskBarIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTaskBarIcon *result;
     char *kwnames[] = {
@@ -10903,7 +11034,7 @@ static PyObject *_wrap_new_TaskBarIcon(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_TaskBarIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_TaskBarIcon(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10928,7 +11059,7 @@ static PyObject *_wrap_delete_TaskBarIcon(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTaskBarIcon *arg1 = (wxTaskBarIcon *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10953,14 +11084,14 @@ static PyObject *_wrap_TaskBarIcon_Destroy(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * TaskBarIcon_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TaskBarIcon_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIcon, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TaskBarIconEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 ;
     wxTaskBarIcon *arg2 = (wxTaskBarIcon *) 0 ;
@@ -10972,7 +11103,7 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_TaskBarIconEvent",kwnames,&obj0,&obj1)) goto fail;
-    arg1 = (wxEventType) SWIG_AsInt(obj0); 
+    arg1 = (wxEventType)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxTaskBarIcon,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -10990,14 +11121,14 @@ static PyObject *_wrap_new_TaskBarIconEvent(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * TaskBarIconEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TaskBarIconEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTaskBarIconEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_FileSelectorPromptStr_set(PyObject *_val) {
+static int _wrap_FileSelectorPromptStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FileSelectorPromptStr is read-only.");
     return 1;
 }
@@ -11017,7 +11148,7 @@ static PyObject *_wrap_FileSelectorPromptStr_get() {
 }
 
 
-static int _wrap_DirSelectorPromptStr_set(PyObject *_val) {
+static int _wrap_DirSelectorPromptStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DirSelectorPromptStr is read-only.");
     return 1;
 }
@@ -11037,7 +11168,7 @@ static PyObject *_wrap_DirSelectorPromptStr_get() {
 }
 
 
-static int _wrap_DirDialogNameStr_set(PyObject *_val) {
+static int _wrap_DirDialogNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DirDialogNameStr is read-only.");
     return 1;
 }
@@ -11057,7 +11188,7 @@ static PyObject *_wrap_DirDialogNameStr_get() {
 }
 
 
-static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *_val) {
+static int _wrap_FileSelectorDefaultWildcardStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable FileSelectorDefaultWildcardStr is read-only.");
     return 1;
 }
@@ -11077,7 +11208,7 @@ static PyObject *_wrap_FileSelectorDefaultWildcardStr_get() {
 }
 
 
-static int _wrap_GetTextFromUserPromptStr_set(PyObject *_val) {
+static int _wrap_GetTextFromUserPromptStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GetTextFromUserPromptStr is read-only.");
     return 1;
 }
@@ -11097,7 +11228,7 @@ static PyObject *_wrap_GetTextFromUserPromptStr_get() {
 }
 
 
-static int _wrap_MessageBoxCaptionStr_set(PyObject *_val) {
+static int _wrap_MessageBoxCaptionStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable MessageBoxCaptionStr is read-only.");
     return 1;
 }
@@ -11117,7 +11248,7 @@ static PyObject *_wrap_MessageBoxCaptionStr_get() {
 }
 
 
-static PyObject *_wrap_new_ColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ColourData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *result;
     char *kwnames[] = {
@@ -11139,7 +11270,7 @@ static PyObject *_wrap_new_ColourData(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_delete_ColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_ColourData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11164,7 +11295,7 @@ static PyObject *_wrap_delete_ColourData(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_ColourData_GetChooseFull(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourData_GetChooseFull(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     bool result;
@@ -11192,7 +11323,7 @@ static PyObject *_wrap_ColourData_GetChooseFull(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ColourData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourData_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     wxColour result;
@@ -11222,7 +11353,7 @@ static PyObject *_wrap_ColourData_GetColour(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ColourData_GetCustomColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourData_GetCustomColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     int arg2 ;
@@ -11236,7 +11367,7 @@ static PyObject *_wrap_ColourData_GetCustomColour(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_GetCustomColour",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11256,7 +11387,7 @@ static PyObject *_wrap_ColourData_GetCustomColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_ColourData_SetChooseFull(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourData_SetChooseFull(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     int arg2 ;
@@ -11269,7 +11400,7 @@ static PyObject *_wrap_ColourData_SetChooseFull(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ColourData_SetChooseFull",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11285,7 +11416,7 @@ static PyObject *_wrap_ColourData_SetChooseFull(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_ColourData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourData_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     wxColour *arg2 = 0 ;
@@ -11317,7 +11448,7 @@ static PyObject *_wrap_ColourData_SetColour(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_ColourData_SetCustomColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourData_SetCustomColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourData *arg1 = (wxColourData *) 0 ;
     int arg2 ;
@@ -11333,7 +11464,7 @@ static PyObject *_wrap_ColourData_SetCustomColour(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ColourData_SetCustomColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxColourData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = &temp3;
@@ -11353,14 +11484,14 @@ static PyObject *_wrap_ColourData_SetCustomColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject * ColourData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ColourData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxColourData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ColourDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ColourDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxColourData *arg2 = (wxColourData *) NULL ;
@@ -11393,7 +11524,7 @@ static PyObject *_wrap_new_ColourDialog(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_ColourDialog_GetColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ColourDialog_GetColourData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColourDialog *arg1 = (wxColourDialog *) 0 ;
     wxColourData *result;
@@ -11422,14 +11553,14 @@ static PyObject *_wrap_ColourDialog_GetColourData(PyObject *self, PyObject *args
 }
 
 
-static PyObject * ColourDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ColourDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxColourDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_DirDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString const &arg2_defvalue = wxPyDirSelectorPromptStr ;
@@ -11478,7 +11609,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k
         }
     }
     if (obj3) {
-        arg4 = (long) SWIG_AsLong(obj3); 
+        arg4 = (long)SWIG_As_long(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -11539,7 +11670,7 @@ static PyObject *_wrap_new_DirDialog(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_DirDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirDialog_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     wxString result;
@@ -11571,7 +11702,7 @@ static PyObject *_wrap_DirDialog_GetPath(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_DirDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirDialog_GetMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     wxString result;
@@ -11603,7 +11734,7 @@ static PyObject *_wrap_DirDialog_GetMessage(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DirDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirDialog_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     long result;
@@ -11622,14 +11753,14 @@ static PyObject *_wrap_DirDialog_GetStyle(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_DirDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirDialog_SetMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -11670,7 +11801,7 @@ static PyObject *_wrap_DirDialog_SetMessage(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DirDialog_SetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDirDialog *arg1 = (wxDirDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -11711,14 +11842,14 @@ static PyObject *_wrap_DirDialog_SetPath(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * DirDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DirDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDirDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FileDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString const &arg2_defvalue = wxPyFileSelectorPromptStr ;
@@ -11781,7 +11912,7 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -11837,7 +11968,7 @@ static PyObject *_wrap_new_FileDialog(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_FileDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -11878,7 +12009,7 @@ static PyObject *_wrap_FileDialog_SetMessage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_FileDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -11919,7 +12050,7 @@ static PyObject *_wrap_FileDialog_SetPath(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FileDialog_SetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetDirectory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -11960,7 +12091,7 @@ static PyObject *_wrap_FileDialog_SetDirectory(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileDialog_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -12001,7 +12132,7 @@ static PyObject *_wrap_FileDialog_SetFilename(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FileDialog_SetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetWildcard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -12042,7 +12173,7 @@ static PyObject *_wrap_FileDialog_SetWildcard(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FileDialog_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     long arg2 ;
@@ -12055,7 +12186,7 @@ static PyObject *_wrap_FileDialog_SetStyle(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12071,7 +12202,7 @@ static PyObject *_wrap_FileDialog_SetStyle(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     int arg2 ;
@@ -12084,7 +12215,7 @@ static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetFilterIndex",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFileDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12100,7 +12231,7 @@ static PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FileDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString result;
@@ -12132,7 +12263,7 @@ static PyObject *_wrap_FileDialog_GetMessage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_FileDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString result;
@@ -12164,7 +12295,7 @@ static PyObject *_wrap_FileDialog_GetPath(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FileDialog_GetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetDirectory(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString result;
@@ -12196,7 +12327,7 @@ static PyObject *_wrap_FileDialog_GetDirectory(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileDialog_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString result;
@@ -12228,7 +12359,7 @@ static PyObject *_wrap_FileDialog_GetFilename(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FileDialog_GetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetWildcard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     wxString result;
@@ -12260,7 +12391,7 @@ static PyObject *_wrap_FileDialog_GetWildcard(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FileDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     long result;
@@ -12279,14 +12410,14 @@ static PyObject *_wrap_FileDialog_GetStyle(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     int result;
@@ -12305,14 +12436,14 @@ static PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FileDialog_GetFilenames(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetFilenames(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     PyObject *result;
@@ -12338,7 +12469,7 @@ static PyObject *_wrap_FileDialog_GetFilenames(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FileDialog_GetPaths(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FileDialog_GetPaths(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFileDialog *arg1 = (wxFileDialog *) 0 ;
     PyObject *result;
@@ -12364,14 +12495,14 @@ static PyObject *_wrap_FileDialog_GetPaths(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * FileDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FileDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFileDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MultiChoiceDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -12416,7 +12547,7 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj4) {
-        arg6 = (long) SWIG_AsLong(obj4); 
+        arg6 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -12462,7 +12593,7 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMultiChoiceDialog *arg1 = (wxMultiChoiceDialog *) 0 ;
     wxArrayInt *arg2 = 0 ;
@@ -12512,7 +12643,7 @@ static PyObject *_wrap_MultiChoiceDialog_SetSelections(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_MultiChoiceDialog_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MultiChoiceDialog_GetSelections(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMultiChoiceDialog *arg1 = (wxMultiChoiceDialog *) 0 ;
     PyObject *result;
@@ -12538,14 +12669,14 @@ static PyObject *_wrap_MultiChoiceDialog_GetSelections(PyObject *self, PyObject
 }
 
 
-static PyObject * MultiChoiceDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MultiChoiceDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMultiChoiceDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_SingleChoiceDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -12588,7 +12719,7 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py
         if (arg5 == NULL) SWIG_fail;
     }
     if (obj4) {
-        arg6 = (long) SWIG_AsLong(obj4); 
+        arg6 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -12634,7 +12765,7 @@ static PyObject *_wrap_new_SingleChoiceDialog(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_SingleChoiceDialog_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SingleChoiceDialog_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ;
     int result;
@@ -12653,14 +12784,14 @@ static PyObject *_wrap_SingleChoiceDialog_GetSelection(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_SingleChoiceDialog_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SingleChoiceDialog_GetStringSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ;
     wxString result;
@@ -12692,7 +12823,7 @@ static PyObject *_wrap_SingleChoiceDialog_GetStringSelection(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ;
     int arg2 ;
@@ -12705,7 +12836,7 @@ static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:SingleChoiceDialog_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSingleChoiceDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12721,14 +12852,14 @@ static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *self, PyObject
 }
 
 
-static PyObject * SingleChoiceDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * SingleChoiceDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxSingleChoiceDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_TextEntryDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -12777,7 +12908,7 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -12825,7 +12956,7 @@ static PyObject *_wrap_new_TextEntryDialog(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_TextEntryDialog_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextEntryDialog_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextEntryDialog *arg1 = (wxTextEntryDialog *) 0 ;
     wxString result;
@@ -12857,7 +12988,7 @@ static PyObject *_wrap_TextEntryDialog_GetValue(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxTextEntryDialog *arg1 = (wxTextEntryDialog *) 0 ;
     wxString *arg2 = 0 ;
@@ -12898,14 +13029,14 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * TextEntryDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * TextEntryDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxTextEntryDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FontData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FontData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *result;
     char *kwnames[] = {
@@ -12927,7 +13058,7 @@ static PyObject *_wrap_new_FontData(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_delete_FontData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FontData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12952,7 +13083,7 @@ static PyObject *_wrap_delete_FontData(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_FontData_EnableEffects(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_EnableEffects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     bool arg2 ;
@@ -12965,7 +13096,7 @@ static PyObject *_wrap_FontData_EnableEffects(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_EnableEffects",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12981,7 +13112,7 @@ static PyObject *_wrap_FontData_EnableEffects(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     bool result;
@@ -13009,7 +13140,7 @@ static PyObject *_wrap_FontData_GetAllowSymbols(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FontData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     wxColour result;
@@ -13039,7 +13170,7 @@ static PyObject *_wrap_FontData_GetColour(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FontData_GetChosenFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_GetChosenFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     wxFont result;
@@ -13069,7 +13200,7 @@ static PyObject *_wrap_FontData_GetChosenFont(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FontData_GetEnableEffects(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_GetEnableEffects(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     bool result;
@@ -13097,7 +13228,7 @@ static PyObject *_wrap_FontData_GetEnableEffects(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FontData_GetInitialFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_GetInitialFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     wxFont result;
@@ -13127,7 +13258,7 @@ static PyObject *_wrap_FontData_GetInitialFont(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FontData_GetShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_GetShowHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     bool result;
@@ -13155,7 +13286,7 @@ static PyObject *_wrap_FontData_GetShowHelp(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     bool arg2 ;
@@ -13168,7 +13299,7 @@ static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetAllowSymbols",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13184,7 +13315,7 @@ static PyObject *_wrap_FontData_SetAllowSymbols(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FontData_SetChosenFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_SetChosenFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     wxFont *arg2 = 0 ;
@@ -13218,7 +13349,7 @@ static PyObject *_wrap_FontData_SetChosenFont(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FontData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     wxColour *arg2 = 0 ;
@@ -13250,7 +13381,7 @@ static PyObject *_wrap_FontData_SetColour(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_FontData_SetInitialFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_SetInitialFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     wxFont *arg2 = 0 ;
@@ -13284,7 +13415,7 @@ static PyObject *_wrap_FontData_SetInitialFont(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_FontData_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_SetRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     int arg2 ;
@@ -13299,9 +13430,9 @@ static PyObject *_wrap_FontData_SetRange(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:FontData_SetRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13317,7 +13448,7 @@ static PyObject *_wrap_FontData_SetRange(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_FontData_SetShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontData_SetShowHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontData *arg1 = (wxFontData *) 0 ;
     bool arg2 ;
@@ -13330,7 +13461,7 @@ static PyObject *_wrap_FontData_SetShowHelp(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontData_SetShowHelp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFontData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13346,14 +13477,14 @@ static PyObject *_wrap_FontData_SetShowHelp(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * FontData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FontData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFontData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FontDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFontData *arg2 = 0 ;
@@ -13389,7 +13520,7 @@ static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_FontDialog_GetFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FontDialog_GetFontData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFontDialog *arg1 = (wxFontDialog *) 0 ;
     wxFontData *result;
@@ -13418,14 +13549,14 @@ static PyObject *_wrap_FontDialog_GetFontData(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * FontDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FontDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFontDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MessageDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -13463,7 +13594,7 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj3) {
-        arg4 = (long) SWIG_AsLong(obj3); 
+        arg4 = (long)SWIG_As_long(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -13503,14 +13634,14 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * MessageDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MessageDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMessageDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_ProgressDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -13541,7 +13672,7 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -13549,7 +13680,7 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13583,7 +13714,7 @@ static PyObject *_wrap_new_ProgressDialog(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProgressDialog_Update(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProgressDialog *arg1 = (wxProgressDialog *) 0 ;
     int arg2 ;
@@ -13601,7 +13732,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:ProgressDialog_Update",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxProgressDialog,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         {
@@ -13634,7 +13765,7 @@ static PyObject *_wrap_ProgressDialog_Update(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_ProgressDialog_Resume(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_ProgressDialog_Resume(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxProgressDialog *arg1 = (wxProgressDialog *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13659,14 +13790,14 @@ static PyObject *_wrap_ProgressDialog_Resume(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * ProgressDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * ProgressDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxProgressDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FindDialogEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FindDialogEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) 0 ;
@@ -13679,11 +13810,11 @@ static PyObject *_wrap_new_FindDialogEvent(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FindDialogEvent",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13700,7 +13831,7 @@ static PyObject *_wrap_new_FindDialogEvent(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     int result;
@@ -13719,14 +13850,14 @@ static PyObject *_wrap_FindDialogEvent_GetFlags(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FindDialogEvent_GetFindString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_GetFindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxString *result;
@@ -13761,7 +13892,7 @@ static PyObject *_wrap_FindDialogEvent_GetFindString(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_FindDialogEvent_GetReplaceString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_GetReplaceString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxString *result;
@@ -13796,7 +13927,7 @@ static PyObject *_wrap_FindDialogEvent_GetReplaceString(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FindDialogEvent_GetDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_GetDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxFindReplaceDialog *result;
@@ -13822,7 +13953,7 @@ static PyObject *_wrap_FindDialogEvent_GetDialog(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     int arg2 ;
@@ -13835,7 +13966,7 @@ static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindDialogEvent_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFindDialogEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13851,7 +13982,7 @@ static PyObject *_wrap_FindDialogEvent_SetFlags(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -13892,7 +14023,7 @@ static PyObject *_wrap_FindDialogEvent_SetFindString(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindDialogEvent *arg1 = (wxFindDialogEvent *) 0 ;
     wxString *arg2 = 0 ;
@@ -13933,14 +14064,14 @@ static PyObject *_wrap_FindDialogEvent_SetReplaceString(PyObject *self, PyObject
 }
 
 
-static PyObject * FindDialogEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FindDialogEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFindDialogEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FindReplaceData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FindReplaceData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxFindReplaceData *result;
@@ -13951,7 +14082,7 @@ static PyObject *_wrap_new_FindReplaceData(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FindReplaceData",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13968,7 +14099,7 @@ static PyObject *_wrap_new_FindReplaceData(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_delete_FindReplaceData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_FindReplaceData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13993,7 +14124,7 @@ static PyObject *_wrap_delete_FindReplaceData(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_FindReplaceData_GetFindString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceData_GetFindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     wxString *result;
@@ -14028,7 +14159,7 @@ static PyObject *_wrap_FindReplaceData_GetFindString(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_FindReplaceData_GetReplaceString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceData_GetReplaceString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     wxString *result;
@@ -14063,7 +14194,7 @@ static PyObject *_wrap_FindReplaceData_GetReplaceString(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_FindReplaceData_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceData_GetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     int result;
@@ -14082,14 +14213,14 @@ static PyObject *_wrap_FindReplaceData_GetFlags(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     int arg2 ;
@@ -14102,7 +14233,7 @@ static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FindReplaceData_SetFlags",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxFindReplaceData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14118,7 +14249,7 @@ static PyObject *_wrap_FindReplaceData_SetFlags(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     wxString *arg2 = 0 ;
@@ -14159,7 +14290,7 @@ static PyObject *_wrap_FindReplaceData_SetFindString(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceData *arg1 = (wxFindReplaceData *) 0 ;
     wxString *arg2 = 0 ;
@@ -14200,14 +14331,14 @@ static PyObject *_wrap_FindReplaceData_SetReplaceString(PyObject *self, PyObject
 }
 
 
-static PyObject * FindReplaceData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FindReplaceData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFindReplaceData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_FindReplaceDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxFindReplaceData *arg2 = (wxFindReplaceData *) 0 ;
@@ -14234,7 +14365,7 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO
         temp3 = True;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14260,7 +14391,7 @@ static PyObject *_wrap_new_FindReplaceDialog(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_new_PreFindReplaceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreFindReplaceDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceDialog *result;
     char *kwnames[] = {
@@ -14283,7 +14414,7 @@ static PyObject *_wrap_new_PreFindReplaceDialog(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceDialog_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceDialog *arg1 = (wxFindReplaceDialog *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -14314,7 +14445,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args,
         temp4 = True;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14341,7 +14472,7 @@ static PyObject *_wrap_FindReplaceDialog_Create(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindReplaceDialog_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceDialog_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceDialog *arg1 = (wxFindReplaceDialog *) 0 ;
     wxFindReplaceData *result;
@@ -14367,7 +14498,7 @@ static PyObject *_wrap_FindReplaceDialog_GetData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_FindReplaceDialog_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_FindReplaceDialog_SetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFindReplaceDialog *arg1 = (wxFindReplaceDialog *) 0 ;
     wxFindReplaceData *arg2 = (wxFindReplaceData *) 0 ;
@@ -14396,14 +14527,14 @@ static PyObject *_wrap_FindReplaceDialog_SetData(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * FindReplaceDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * FindReplaceDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxFindReplaceDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MDIParentFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -14436,7 +14567,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -14459,7 +14590,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -14500,7 +14631,7 @@ static PyObject *_wrap_new_MDIParentFrame(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_new_PreMDIParentFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreMDIParentFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *result;
     char *kwnames[] = {
@@ -14523,7 +14654,7 @@ static PyObject *_wrap_new_PreMDIParentFrame(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -14560,7 +14691,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -14583,7 +14714,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -14625,7 +14756,7 @@ static PyObject *_wrap_MDIParentFrame_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_MDIParentFrame_ActivateNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_ActivateNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14650,7 +14781,7 @@ static PyObject *_wrap_MDIParentFrame_ActivateNext(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_MDIParentFrame_ActivatePrevious(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_ActivatePrevious(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14675,7 +14806,7 @@ static PyObject *_wrap_MDIParentFrame_ActivatePrevious(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_MDIParentFrame_ArrangeIcons(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_ArrangeIcons(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14700,7 +14831,7 @@ static PyObject *_wrap_MDIParentFrame_ArrangeIcons(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_MDIParentFrame_Cascade(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_Cascade(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14725,7 +14856,7 @@ static PyObject *_wrap_MDIParentFrame_Cascade(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     wxMDIChildFrame *result;
@@ -14753,7 +14884,7 @@ static PyObject *_wrap_MDIParentFrame_GetActiveChild(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     wxMDIClientWindow *result;
@@ -14781,7 +14912,7 @@ static PyObject *_wrap_MDIParentFrame_GetClientWindow(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     wxWindow *result;
@@ -14809,7 +14940,7 @@ static PyObject *_wrap_MDIParentFrame_GetToolBar(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_MDIParentFrame_Tile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIParentFrame_Tile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -14834,14 +14965,14 @@ static PyObject *_wrap_MDIParentFrame_Tile(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * MDIParentFrame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MDIParentFrame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMDIParentFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MDIChildFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -14874,7 +15005,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMDIParentFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -14897,7 +15028,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -14938,7 +15069,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreMDIChildFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIChildFrame *result;
     char *kwnames[] = {
@@ -14961,7 +15092,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIChildFrame_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIChildFrame *arg1 = (wxMDIChildFrame *) 0 ;
     wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ;
@@ -14998,7 +15129,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMDIParentFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int const) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -15021,7 +15152,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -15063,7 +15194,7 @@ static PyObject *_wrap_MDIChildFrame_Create(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_MDIChildFrame_Activate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIChildFrame_Activate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIChildFrame *arg1 = (wxMDIChildFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15088,7 +15219,7 @@ static PyObject *_wrap_MDIChildFrame_Activate(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIChildFrame *arg1 = (wxMDIChildFrame *) 0 ;
     bool arg2 ;
@@ -15101,7 +15232,7 @@ static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MDIChildFrame_Maximize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMDIChildFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15117,7 +15248,7 @@ static PyObject *_wrap_MDIChildFrame_Maximize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MDIChildFrame_Restore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIChildFrame_Restore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIChildFrame *arg1 = (wxMDIChildFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15142,14 +15273,14 @@ static PyObject *_wrap_MDIChildFrame_Restore(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * MDIChildFrame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MDIChildFrame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMDIChildFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_MDIClientWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIParentFrame *arg1 = (wxMDIParentFrame *) 0 ;
     long arg2 = (long) 0 ;
@@ -15164,7 +15295,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMDIParentFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (long) SWIG_AsLong(obj1); 
+        arg2 = (long)SWIG_As_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15182,7 +15313,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreMDIClientWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIClientWindow *result;
     char *kwnames[] = {
@@ -15205,7 +15336,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_MDIClientWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxMDIClientWindow *arg1 = (wxMDIClientWindow *) 0 ;
     wxMDIParentFrame *arg2 = (wxMDIParentFrame *) 0 ;
@@ -15224,7 +15355,7 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxMDIParentFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (long) SWIG_AsLong(obj2); 
+        arg3 = (long)SWIG_As_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15243,14 +15374,14 @@ static PyObject *_wrap_MDIClientWindow_Create(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * MDIClientWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * MDIClientWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxMDIClientWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -15279,7 +15410,7 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -15295,7 +15426,7 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -15328,7 +15459,7 @@ static PyObject *_wrap_new_PyWindow(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_new_PrePyWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePyWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *result;
     char *kwnames[] = {
@@ -15351,7 +15482,7 @@ static PyObject *_wrap_new_PrePyWindow(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PyWindow__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -15382,7 +15513,7 @@ static PyObject *_wrap_PyWindow__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyWindow_SetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_SetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -15414,7 +15545,7 @@ static PyObject *_wrap_PyWindow_SetBestSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -15433,13 +15564,13 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15455,7 +15586,7 @@ static PyObject *_wrap_PyWindow_base_DoMoveWindow(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -15476,16 +15607,16 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15502,7 +15633,7 @@ static PyObject *_wrap_PyWindow_base_DoSetSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -15517,9 +15648,9 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15535,7 +15666,7 @@ static PyObject *_wrap_PyWindow_base_DoSetClientSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int arg2 ;
@@ -15550,9 +15681,9 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15568,20 +15699,22 @@ static PyObject *_wrap_PyWindow_base_DoSetVirtualSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15593,34 +15726,32 @@ static PyObject *_wrap_PyWindow_base_DoGetSize(PyObject *self, PyObject *args, P
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetClientSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15632,34 +15763,32 @@ static PyObject *_wrap_PyWindow_base_DoGetClientSize(PyObject *self, PyObject *a
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWindow_base_DoGetPosition",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15671,21 +15800,17 @@ static PyObject *_wrap_PyWindow_base_DoGetPosition(PyObject *self, PyObject *arg
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize result;
@@ -15715,7 +15840,7 @@ static PyObject *_wrap_PyWindow_base_DoGetVirtualSize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize result;
@@ -15745,7 +15870,7 @@ static PyObject *_wrap_PyWindow_base_DoGetBestSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -15770,7 +15895,7 @@ static PyObject *_wrap_PyWindow_base_InitDialog(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -15798,7 +15923,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataToWindow(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -15826,7 +15951,7 @@ static PyObject *_wrap_PyWindow_base_TransferDataFromWindow(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyWindow_base_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -15854,7 +15979,7 @@ static PyObject *_wrap_PyWindow_base_Validate(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -15882,7 +16007,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocus(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -15910,7 +16035,7 @@ static PyObject *_wrap_PyWindow_base_AcceptsFocusFromKeyboard(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxSize result;
@@ -15940,7 +16065,7 @@ static PyObject *_wrap_PyWindow_base_GetMaxSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyWindow_base_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -15969,7 +16094,7 @@ static PyObject *_wrap_PyWindow_base_AddChild(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -15998,7 +16123,7 @@ static PyObject *_wrap_PyWindow_base_RemoveChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     bool result;
@@ -16026,7 +16151,7 @@ static PyObject *_wrap_PyWindow_base_ShouldInheritColours(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyWindow_base_ApplyParentThemeBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -16058,7 +16183,7 @@ static PyObject *_wrap_PyWindow_base_ApplyParentThemeBackground(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWindow *arg1 = (wxPyWindow *) 0 ;
     wxVisualAttributes result;
@@ -16088,14 +16213,14 @@ static PyObject *_wrap_PyWindow_base_GetDefaultAttributes(PyObject *self, PyObje
 }
 
 
-static PyObject * PyWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyPanel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -16124,7 +16249,7 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -16140,7 +16265,7 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -16173,7 +16298,7 @@ static PyObject *_wrap_new_PyPanel(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_new_PrePyPanel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePyPanel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *result;
     char *kwnames[] = {
@@ -16196,7 +16321,7 @@ static PyObject *_wrap_new_PrePyPanel(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_PyPanel__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -16227,7 +16352,7 @@ static PyObject *_wrap_PyPanel__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_SetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_SetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize *arg2 = 0 ;
@@ -16259,7 +16384,7 @@ static PyObject *_wrap_PyPanel_SetBestSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -16278,13 +16403,13 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyPanel_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16300,7 +16425,7 @@ static PyObject *_wrap_PyPanel_base_DoMoveWindow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -16321,16 +16446,16 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyPanel_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -16347,7 +16472,7 @@ static PyObject *_wrap_PyPanel_base_DoSetSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -16362,9 +16487,9 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16380,7 +16505,7 @@ static PyObject *_wrap_PyPanel_base_DoSetClientSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int arg2 ;
@@ -16395,9 +16520,9 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyPanel_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -16413,20 +16538,22 @@ static PyObject *_wrap_PyPanel_base_DoSetVirtualSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -16438,34 +16565,32 @@ static PyObject *_wrap_PyPanel_base_DoGetSize(PyObject *self, PyObject *args, Py
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetClientSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -16477,34 +16602,32 @@ static PyObject *_wrap_PyPanel_base_DoGetClientSize(PyObject *self, PyObject *ar
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyPanel_base_DoGetPosition",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPanel,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -16516,21 +16639,17 @@ static PyObject *_wrap_PyPanel_base_DoGetPosition(PyObject *self, PyObject *args
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize result;
@@ -16560,7 +16679,7 @@ static PyObject *_wrap_PyPanel_base_DoGetVirtualSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize result;
@@ -16590,7 +16709,7 @@ static PyObject *_wrap_PyPanel_base_DoGetBestSize(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     PyObject * obj0 = 0 ;
@@ -16615,7 +16734,7 @@ static PyObject *_wrap_PyPanel_base_InitDialog(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -16643,7 +16762,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataToWindow(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -16671,7 +16790,7 @@ static PyObject *_wrap_PyPanel_base_TransferDataFromWindow(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPanel_base_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -16699,7 +16818,7 @@ static PyObject *_wrap_PyPanel_base_Validate(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -16727,7 +16846,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocus(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -16755,7 +16874,7 @@ static PyObject *_wrap_PyPanel_base_AcceptsFocusFromKeyboard(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxSize result;
@@ -16785,7 +16904,7 @@ static PyObject *_wrap_PyPanel_base_GetMaxSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyPanel_base_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -16814,7 +16933,7 @@ static PyObject *_wrap_PyPanel_base_AddChild(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -16843,7 +16962,7 @@ static PyObject *_wrap_PyPanel_base_RemoveChild(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     bool result;
@@ -16871,7 +16990,7 @@ static PyObject *_wrap_PyPanel_base_ShouldInheritColours(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPanel_base_ApplyParentThemeBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxColour *arg2 = 0 ;
@@ -16903,7 +17022,7 @@ static PyObject *_wrap_PyPanel_base_ApplyParentThemeBackground(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPanel *arg1 = (wxPyPanel *) 0 ;
     wxVisualAttributes result;
@@ -16933,14 +17052,14 @@ static PyObject *_wrap_PyPanel_base_GetDefaultAttributes(PyObject *self, PyObjec
 }
 
 
-static PyObject * PyPanel_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyPanel_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPanel, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) (int)-1 ;
@@ -16969,7 +17088,7 @@ static PyObject *_wrap_new_PyScrolledWindow(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int const) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -16985,7 +17104,7 @@ static PyObject *_wrap_new_PyScrolledWindow(PyObject *self, PyObject *args, PyOb
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -17018,7 +17137,7 @@ static PyObject *_wrap_new_PyScrolledWindow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_new_PrePyScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePyScrolledWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *result;
     char *kwnames[] = {
@@ -17041,7 +17160,7 @@ static PyObject *_wrap_new_PrePyScrolledWindow(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyScrolledWindow__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -17072,7 +17191,7 @@ static PyObject *_wrap_PyScrolledWindow__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_SetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_SetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize *arg2 = 0 ;
@@ -17104,7 +17223,7 @@ static PyObject *_wrap_PyScrolledWindow_SetBestSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -17123,13 +17242,13 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyScrolledWindow_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17145,7 +17264,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoMoveWindow(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -17166,16 +17285,16 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyScrolledWindow_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -17192,7 +17311,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -17207,9 +17326,9 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17225,7 +17344,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetClientSize(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int arg2 ;
@@ -17240,9 +17359,9 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *self, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyScrolledWindow_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -17258,20 +17377,22 @@ static PyObject *_wrap_PyScrolledWindow_base_DoSetVirtualSize(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17283,34 +17404,32 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetSize(PyObject *self, PyObject
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetClientSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17322,34 +17441,32 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetClientSize(PyObject *self, PyO
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyScrolledWindow_base_DoGetPosition",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyScrolledWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -17361,21 +17478,17 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetPosition(PyObject *self, PyObj
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize result;
@@ -17405,7 +17518,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetVirtualSize(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize result;
@@ -17435,7 +17548,7 @@ static PyObject *_wrap_PyScrolledWindow_base_DoGetBestSize(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17460,7 +17573,7 @@ static PyObject *_wrap_PyScrolledWindow_base_InitDialog(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -17488,7 +17601,7 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataToWindow(PyObject *self
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -17516,7 +17629,7 @@ static PyObject *_wrap_PyScrolledWindow_base_TransferDataFromWindow(PyObject *se
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -17544,7 +17657,7 @@ static PyObject *_wrap_PyScrolledWindow_base_Validate(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -17572,7 +17685,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocus(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -17600,7 +17713,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard(PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxSize result;
@@ -17630,7 +17743,7 @@ static PyObject *_wrap_PyScrolledWindow_base_GetMaxSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -17659,7 +17772,7 @@ static PyObject *_wrap_PyScrolledWindow_base_AddChild(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -17688,7 +17801,7 @@ static PyObject *_wrap_PyScrolledWindow_base_RemoveChild(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     bool result;
@@ -17716,7 +17829,7 @@ static PyObject *_wrap_PyScrolledWindow_base_ShouldInheritColours(PyObject *self
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_ApplyParentThemeBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_ApplyParentThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxColour *arg2 = 0 ;
@@ -17748,7 +17861,7 @@ static PyObject *_wrap_PyScrolledWindow_base_ApplyParentThemeBackground(PyObject
 }
 
 
-static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyScrolledWindow *arg1 = (wxPyScrolledWindow *) 0 ;
     wxVisualAttributes result;
@@ -17778,14 +17891,14 @@ static PyObject *_wrap_PyScrolledWindow_base_GetDefaultAttributes(PyObject *self
 }
 
 
-static PyObject * PyScrolledWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyScrolledWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyScrolledWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_PrintoutTitleStr_set(PyObject *_val) {
+static int _wrap_PrintoutTitleStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable PrintoutTitleStr is read-only.");
     return 1;
 }
@@ -17805,7 +17918,7 @@ static PyObject *_wrap_PrintoutTitleStr_get() {
 }
 
 
-static int _wrap_PreviewCanvasNameStr_set(PyObject *_val) {
+static int _wrap_PreviewCanvasNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable PreviewCanvasNameStr is read-only.");
     return 1;
 }
@@ -17825,7 +17938,7 @@ static PyObject *_wrap_PreviewCanvasNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_PrintData__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PrintData__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPrintData *result;
     
@@ -17844,7 +17957,7 @@ static PyObject *_wrap_new_PrintData__SWIG_0(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_new_PrintData__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PrintData__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPrintData *arg1 = 0 ;
     wxPrintData *result;
@@ -17905,7 +18018,7 @@ static PyObject *_wrap_new_PrintData(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_delete_PrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -17930,7 +18043,7 @@ static PyObject *_wrap_delete_PrintData(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PrintData_GetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetNoCopies(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int result;
@@ -17949,14 +18062,14 @@ static PyObject *_wrap_PrintData_GetNoCopies(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetCollate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     bool result;
@@ -17984,7 +18097,7 @@ static PyObject *_wrap_PrintData_GetCollate(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PrintData_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int result;
@@ -18003,14 +18116,14 @@ static PyObject *_wrap_PrintData_GetOrientation(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     bool result;
@@ -18038,7 +18151,7 @@ static PyObject *_wrap_PrintData_Ok(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *result;
@@ -18073,7 +18186,7 @@ static PyObject *_wrap_PrintData_GetPrinterName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     bool result;
@@ -18101,7 +18214,7 @@ static PyObject *_wrap_PrintData_GetColour(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PrintData_GetDuplex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetDuplex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int result;
@@ -18120,14 +18233,14 @@ static PyObject *_wrap_PrintData_GetDuplex(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPaperId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int result;
@@ -18146,14 +18259,14 @@ static PyObject *_wrap_PrintData_GetPaperId(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPaperSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxSize *result;
@@ -18182,7 +18295,7 @@ static PyObject *_wrap_PrintData_GetPaperSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintData_GetQuality(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetQuality(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int result;
@@ -18201,14 +18314,14 @@ static PyObject *_wrap_PrintData_GetQuality(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_SetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetNoCopies(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int arg2 ;
@@ -18221,7 +18334,7 @@ static PyObject *_wrap_PrintData_SetNoCopies(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18237,7 +18350,7 @@ static PyObject *_wrap_PrintData_SetNoCopies(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PrintData_SetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetCollate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     bool arg2 ;
@@ -18250,7 +18363,7 @@ static PyObject *_wrap_PrintData_SetCollate(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetCollate",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18266,7 +18379,7 @@ static PyObject *_wrap_PrintData_SetCollate(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PrintData_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int arg2 ;
@@ -18279,7 +18392,7 @@ static PyObject *_wrap_PrintData_SetOrientation(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18295,7 +18408,7 @@ static PyObject *_wrap_PrintData_SetOrientation(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
@@ -18336,7 +18449,7 @@ static PyObject *_wrap_PrintData_SetPrinterName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     bool arg2 ;
@@ -18349,7 +18462,7 @@ static PyObject *_wrap_PrintData_SetColour(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetColour",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18365,7 +18478,7 @@ static PyObject *_wrap_PrintData_SetColour(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PrintData_SetDuplex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetDuplex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int arg2 ;
@@ -18378,7 +18491,7 @@ static PyObject *_wrap_PrintData_SetDuplex(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetDuplex",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDuplexMode) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18394,7 +18507,7 @@ static PyObject *_wrap_PrintData_SetDuplex(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PrintData_SetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPaperId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int arg2 ;
@@ -18407,7 +18520,7 @@ static PyObject *_wrap_PrintData_SetPaperId(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPaperId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxPaperSize) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18423,7 +18536,7 @@ static PyObject *_wrap_PrintData_SetPaperId(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PrintData_SetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPaperSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxSize *arg2 = 0 ;
@@ -18455,7 +18568,7 @@ static PyObject *_wrap_PrintData_SetPaperSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetQuality(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int arg2 ;
@@ -18468,7 +18581,7 @@ static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetQuality",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -18484,7 +18597,7 @@ static PyObject *_wrap_PrintData_SetQuality(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *result;
@@ -18519,7 +18632,7 @@ static PyObject *_wrap_PrintData_GetPrinterCommand(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterOptions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterOptions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *result;
@@ -18554,7 +18667,7 @@ static PyObject *_wrap_PrintData_GetPrinterOptions(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_GetPreviewCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPreviewCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *result;
@@ -18589,7 +18702,7 @@ static PyObject *_wrap_PrintData_GetPreviewCommand(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *result;
@@ -18624,7 +18737,7 @@ static PyObject *_wrap_PrintData_GetFilename(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PrintData_GetFontMetricPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetFontMetricPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *result;
@@ -18659,7 +18772,7 @@ static PyObject *_wrap_PrintData_GetFontMetricPath(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     double result;
@@ -18678,14 +18791,14 @@ static PyObject *_wrap_PrintData_GetPrinterScaleX(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     double result;
@@ -18704,14 +18817,14 @@ static PyObject *_wrap_PrintData_GetPrinterScaleY(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     long result;
@@ -18730,14 +18843,14 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateX(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     long result;
@@ -18756,14 +18869,14 @@ static PyObject *_wrap_PrintData_GetPrinterTranslateY(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_GetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int result;
@@ -18782,14 +18895,14 @@ static PyObject *_wrap_PrintData_GetPrintMode(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
@@ -18830,7 +18943,7 @@ static PyObject *_wrap_PrintData_SetPrinterCommand(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
@@ -18871,7 +18984,7 @@ static PyObject *_wrap_PrintData_SetPrinterOptions(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
@@ -18912,7 +19025,7 @@ static PyObject *_wrap_PrintData_SetPreviewCommand(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetFilename(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
@@ -18953,7 +19066,7 @@ static PyObject *_wrap_PrintData_SetFilename(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxString *arg2 = 0 ;
@@ -18994,7 +19107,7 @@ static PyObject *_wrap_PrintData_SetFontMetricPath(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     double arg2 ;
@@ -19007,7 +19120,7 @@ static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19023,7 +19136,7 @@ static PyObject *_wrap_PrintData_SetPrinterScaleX(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     double arg2 ;
@@ -19036,7 +19149,7 @@ static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterScaleY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19052,7 +19165,7 @@ static PyObject *_wrap_PrintData_SetPrinterScaleY(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterScaling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterScaling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     double arg2 ;
@@ -19067,9 +19180,9 @@ static PyObject *_wrap_PrintData_SetPrinterScaling(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterScaling",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (double) SWIG_AsDouble(obj1); 
+    arg2 = (double)SWIG_As_double(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (double) SWIG_AsDouble(obj2); 
+    arg3 = (double)SWIG_As_double(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19085,7 +19198,7 @@ static PyObject *_wrap_PrintData_SetPrinterScaling(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     long arg2 ;
@@ -19098,7 +19211,7 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateX",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19114,7 +19227,7 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateX(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     long arg2 ;
@@ -19127,7 +19240,7 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrinterTranslateY",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19143,7 +19256,7 @@ static PyObject *_wrap_PrintData_SetPrinterTranslateY(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     long arg2 ;
@@ -19158,9 +19271,9 @@ static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PrintData_SetPrinterTranslation",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (long) SWIG_AsLong(obj2); 
+    arg3 = (long)SWIG_As_long(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19176,7 +19289,7 @@ static PyObject *_wrap_PrintData_SetPrinterTranslation(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetPrintMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     int arg2 ;
@@ -19189,7 +19302,7 @@ static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintData_SetPrintMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxPrintMode) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19205,7 +19318,7 @@ static PyObject *_wrap_PrintData_SetPrintMode(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintData_GetOutputStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_GetOutputStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxOutputStream *result;
@@ -19231,7 +19344,7 @@ static PyObject *_wrap_PrintData_GetOutputStream(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintData_SetOutputStream(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintData_SetOutputStream(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintData *arg1 = (wxPrintData *) 0 ;
     wxOutputStream *arg2 = (wxOutputStream *) 0 ;
@@ -19260,14 +19373,14 @@ static PyObject *_wrap_PrintData_SetOutputStream(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * PrintData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PrintData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPrintData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPageSetupDialogData *result;
     
@@ -19286,7 +19399,7 @@ static PyObject *_wrap_new_PageSetupDialogData__SWIG_0(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = 0 ;
     wxPageSetupDialogData *result;
@@ -19347,7 +19460,7 @@ static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_delete_PageSetupDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PageSetupDialogData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -19372,7 +19485,7 @@ static PyObject *_wrap_delete_PageSetupDialogData(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19385,7 +19498,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19401,7 +19514,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableHelp(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19414,7 +19527,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableMargins",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19430,7 +19543,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableMargins(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19443,7 +19556,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnableOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19459,7 +19572,7 @@ static PyObject *_wrap_PageSetupDialogData_EnableOrientation(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19472,7 +19585,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePaper",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19488,7 +19601,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePaper(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19501,7 +19614,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_EnablePrinter",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19517,7 +19630,7 @@ static PyObject *_wrap_PageSetupDialogData_EnablePrinter(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19545,7 +19658,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultMinMargins(PyObject *self,
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19573,7 +19686,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableMargins(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19601,7 +19714,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableOrientation(PyObject *self,
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19629,7 +19742,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePaper(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19657,7 +19770,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnablePrinter(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19685,7 +19798,7 @@ static PyObject *_wrap_PageSetupDialogData_GetEnableHelp(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19713,7 +19826,7 @@ static PyObject *_wrap_PageSetupDialogData_GetDefaultInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetMarginTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint result;
@@ -19743,7 +19856,7 @@ static PyObject *_wrap_PageSetupDialogData_GetMarginTopLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetMarginBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint result;
@@ -19773,7 +19886,7 @@ static PyObject *_wrap_PageSetupDialogData_GetMarginBottomRight(PyObject *self,
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetMinMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetMinMarginTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint result;
@@ -19803,7 +19916,7 @@ static PyObject *_wrap_PageSetupDialogData_GetMinMarginTopLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetMinMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetMinMarginBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint result;
@@ -19833,7 +19946,7 @@ static PyObject *_wrap_PageSetupDialogData_GetMinMarginBottomRight(PyObject *sel
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     int result;
@@ -19852,14 +19965,14 @@ static PyObject *_wrap_PageSetupDialogData_GetPaperId(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetPaperSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxSize result;
@@ -19889,7 +20002,7 @@ static PyObject *_wrap_PageSetupDialogData_GetPaperSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_GetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPrintData *result;
@@ -19918,7 +20031,7 @@ static PyObject *_wrap_PageSetupDialogData_GetPrintData(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool result;
@@ -19946,7 +20059,7 @@ static PyObject *_wrap_PageSetupDialogData_Ok(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19959,7 +20072,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultInfo",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -19975,7 +20088,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     bool arg2 ;
@@ -19988,7 +20101,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *self,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetDefaultMinMargins",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20004,7 +20117,7 @@ static PyObject *_wrap_PageSetupDialogData_SetDefaultMinMargins(PyObject *self,
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetMarginTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -20036,7 +20149,7 @@ static PyObject *_wrap_PageSetupDialogData_SetMarginTopLeft(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetMarginBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -20068,7 +20181,7 @@ static PyObject *_wrap_PageSetupDialogData_SetMarginBottomRight(PyObject *self,
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetMinMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetMinMarginTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -20100,7 +20213,7 @@ static PyObject *_wrap_PageSetupDialogData_SetMinMarginTopLeft(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetMinMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetMinMarginBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -20132,7 +20245,7 @@ static PyObject *_wrap_PageSetupDialogData_SetMinMarginBottomRight(PyObject *sel
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     int arg2 ;
@@ -20145,7 +20258,7 @@ static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PageSetupDialogData_SetPaperId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPageSetupDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxPaperSize) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20161,7 +20274,7 @@ static PyObject *_wrap_PageSetupDialogData_SetPaperId(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetPaperSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxSize *arg2 = 0 ;
@@ -20193,7 +20306,7 @@ static PyObject *_wrap_PageSetupDialogData_SetPaperSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
     wxPrintData *arg2 = 0 ;
@@ -20227,14 +20340,14 @@ static PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *self, PyObject
 }
 
 
-static PyObject * PageSetupDialogData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PageSetupDialogData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPageSetupDialogData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PageSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PageSetupDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPageSetupDialogData *arg2 = (wxPageSetupDialogData *) NULL ;
@@ -20267,7 +20380,7 @@ static PyObject *_wrap_new_PageSetupDialog(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PageSetupDialog_GetPageSetupData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialog_GetPageSetupData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
     wxPageSetupDialogData *result;
@@ -20296,7 +20409,7 @@ static PyObject *_wrap_PageSetupDialog_GetPageSetupData(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPageSetupDialog *arg1 = (wxPageSetupDialog *) 0 ;
     int result;
@@ -20315,21 +20428,21 @@ static PyObject *_wrap_PageSetupDialog_ShowModal(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PageSetupDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PageSetupDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPageSetupDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PrintDialogData__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PrintDialogData__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPrintDialogData *result;
     
@@ -20348,7 +20461,7 @@ static PyObject *_wrap_new_PrintDialogData__SWIG_0(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPrintData *arg1 = 0 ;
     wxPrintDialogData *result;
@@ -20409,7 +20522,7 @@ static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_delete_PrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_PrintDialogData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -20434,7 +20547,7 @@ static PyObject *_wrap_delete_PrintDialogData(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int result;
@@ -20453,14 +20566,14 @@ static PyObject *_wrap_PrintDialogData_GetFromPage(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetToPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int result;
@@ -20479,14 +20592,14 @@ static PyObject *_wrap_PrintDialogData_GetToPage(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int result;
@@ -20505,14 +20618,14 @@ static PyObject *_wrap_PrintDialogData_GetMinPage(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int result;
@@ -20531,14 +20644,14 @@ static PyObject *_wrap_PrintDialogData_GetMaxPage(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int result;
@@ -20557,14 +20670,14 @@ static PyObject *_wrap_PrintDialogData_GetNoCopies(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -20592,7 +20705,7 @@ static PyObject *_wrap_PrintDialogData_GetAllPages(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -20620,7 +20733,7 @@ static PyObject *_wrap_PrintDialogData_GetSelection(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -20648,7 +20761,7 @@ static PyObject *_wrap_PrintDialogData_GetCollate(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -20676,7 +20789,7 @@ static PyObject *_wrap_PrintDialogData_GetPrintToFile(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -20704,7 +20817,7 @@ static PyObject *_wrap_PrintDialogData_GetSetupDialog(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int arg2 ;
@@ -20717,7 +20830,7 @@ static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetFromPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20733,7 +20846,7 @@ static PyObject *_wrap_PrintDialogData_SetFromPage(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int arg2 ;
@@ -20746,7 +20859,7 @@ static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetToPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20762,7 +20875,7 @@ static PyObject *_wrap_PrintDialogData_SetToPage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int arg2 ;
@@ -20775,7 +20888,7 @@ static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMinPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20791,7 +20904,7 @@ static PyObject *_wrap_PrintDialogData_SetMinPage(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int arg2 ;
@@ -20804,7 +20917,7 @@ static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetMaxPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20820,7 +20933,7 @@ static PyObject *_wrap_PrintDialogData_SetMaxPage(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     int arg2 ;
@@ -20833,7 +20946,7 @@ static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetNoCopies",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20849,7 +20962,7 @@ static PyObject *_wrap_PrintDialogData_SetNoCopies(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -20862,7 +20975,7 @@ static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetAllPages",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20878,7 +20991,7 @@ static PyObject *_wrap_PrintDialogData_SetAllPages(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -20891,7 +21004,7 @@ static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20907,7 +21020,7 @@ static PyObject *_wrap_PrintDialogData_SetSelection(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -20920,7 +21033,7 @@ static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetCollate",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20936,7 +21049,7 @@ static PyObject *_wrap_PrintDialogData_SetCollate(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -20949,7 +21062,7 @@ static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetPrintToFile",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20965,7 +21078,7 @@ static PyObject *_wrap_PrintDialogData_SetPrintToFile(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -20978,7 +21091,7 @@ static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_SetSetupDialog",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -20994,7 +21107,7 @@ static PyObject *_wrap_PrintDialogData_SetSetupDialog(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -21007,7 +21120,7 @@ static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePrintToFile",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21023,7 +21136,7 @@ static PyObject *_wrap_PrintDialogData_EnablePrintToFile(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -21036,7 +21149,7 @@ static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableSelection",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21052,7 +21165,7 @@ static PyObject *_wrap_PrintDialogData_EnableSelection(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -21065,7 +21178,7 @@ static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnablePageNumbers",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21081,7 +21194,7 @@ static PyObject *_wrap_PrintDialogData_EnablePageNumbers(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool arg2 ;
@@ -21094,7 +21207,7 @@ static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintDialogData_EnableHelp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintDialogData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21110,7 +21223,7 @@ static PyObject *_wrap_PrintDialogData_EnableHelp(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -21138,7 +21251,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePrintToFile(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -21166,7 +21279,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableSelection(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -21194,7 +21307,7 @@ static PyObject *_wrap_PrintDialogData_GetEnablePageNumbers(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -21222,7 +21335,7 @@ static PyObject *_wrap_PrintDialogData_GetEnableHelp(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PrintDialogData_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     bool result;
@@ -21250,7 +21363,7 @@ static PyObject *_wrap_PrintDialogData_Ok(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PrintDialogData_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_GetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     wxPrintData *result;
@@ -21279,7 +21392,7 @@ static PyObject *_wrap_PrintDialogData_GetPrintData(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PrintDialogData_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialogData_SetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
     wxPrintData *arg2 = 0 ;
@@ -21313,14 +21426,14 @@ static PyObject *_wrap_PrintDialogData_SetPrintData(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * PrintDialogData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PrintDialogData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPrintDialogData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrintDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     wxPrintDialogData *arg2 = (wxPrintDialogData *) NULL ;
@@ -21353,7 +21466,7 @@ static PyObject *_wrap_new_PrintDialog(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PrintDialog_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialog_GetPrintDialogData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
     wxPrintDialogData *result;
@@ -21382,7 +21495,7 @@ static PyObject *_wrap_PrintDialog_GetPrintDialogData(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
     wxDC *result;
@@ -21410,7 +21523,7 @@ static PyObject *_wrap_PrintDialog_GetPrintDC(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintDialog_ShowModal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialog *arg1 = (wxPrintDialog *) 0 ;
     int result;
@@ -21429,21 +21542,21 @@ static PyObject *_wrap_PrintDialog_ShowModal(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * PrintDialog_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PrintDialog_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPrintDialog, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Printer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Printer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintDialogData *arg1 = (wxPrintDialogData *) NULL ;
     wxPrinter *result;
@@ -21472,7 +21585,7 @@ static PyObject *_wrap_new_Printer(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_delete_Printer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_Printer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     PyObject * obj0 = 0 ;
@@ -21497,7 +21610,7 @@ static PyObject *_wrap_delete_Printer(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Printer_CreateAbortWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_CreateAbortWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21530,7 +21643,7 @@ static PyObject *_wrap_Printer_CreateAbortWindow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Printer_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_GetPrintDialogData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxPrintDialogData *result;
@@ -21559,7 +21672,7 @@ static PyObject *_wrap_Printer_GetPrintDialogData(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_Print(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21582,7 +21695,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -21601,7 +21714,7 @@ static PyObject *_wrap_Printer_Print(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Printer_PrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_PrintDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21633,7 +21746,7 @@ static PyObject *_wrap_Printer_PrintDialog(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Printer_ReportError(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_ReportError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21682,7 +21795,7 @@ static PyObject *_wrap_Printer_ReportError(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Printer_Setup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_Setup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -21714,7 +21827,7 @@ static PyObject *_wrap_Printer_Setup(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Printer_GetAbort(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_GetAbort(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrinter *arg1 = (wxPrinter *) 0 ;
     bool result;
@@ -21742,7 +21855,7 @@ static PyObject *_wrap_Printer_GetAbort(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Printer_GetLastError(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printer_GetLastError(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int result;
     char *kwnames[] = {
@@ -21757,21 +21870,21 @@ static PyObject *_wrap_Printer_GetLastError(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * Printer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Printer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPrinter, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Printout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Printout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyPrintoutTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -21815,7 +21928,7 @@ static PyObject *_wrap_new_Printout(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Printout__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -21846,7 +21959,7 @@ static PyObject *_wrap_Printout__setCallbackInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Printout_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxString result;
@@ -21878,7 +21991,7 @@ static PyObject *_wrap_Printout_GetTitle(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Printout_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxDC *result;
@@ -21906,7 +22019,7 @@ static PyObject *_wrap_Printout_GetDC(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Printout_SetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_SetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -21935,7 +22048,7 @@ static PyObject *_wrap_Printout_SetDC(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -21950,9 +22063,9 @@ static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizePixels",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -21968,20 +22081,22 @@ static PyObject *_wrap_Printout_SetPageSizePixels(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Printout_GetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetPageSizePixels(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPageSizePixels",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -21993,21 +22108,17 @@ static PyObject *_wrap_Printout_GetPageSizePixels(PyObject *self, PyObject *args
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -22022,9 +22133,9 @@ static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPageSizeMM",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22040,20 +22151,22 @@ static PyObject *_wrap_Printout_SetPageSizeMM(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Printout_GetPageSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetPageSizeMM(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPageSizeMM",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22065,21 +22178,17 @@ static PyObject *_wrap_Printout_GetPageSizeMM(PyObject *self, PyObject *args, Py
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Printout_SetPPIScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_SetPPIScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -22094,9 +22203,9 @@ static PyObject *_wrap_Printout_SetPPIScreen(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIScreen",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22112,20 +22221,22 @@ static PyObject *_wrap_Printout_SetPPIScreen(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Printout_GetPPIScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetPPIScreen(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPPIScreen",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22137,21 +22248,17 @@ static PyObject *_wrap_Printout_GetPPIScreen(PyObject *self, PyObject *args, PyO
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -22166,9 +22273,9 @@ static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_SetPPIPrinter",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22184,20 +22291,22 @@ static PyObject *_wrap_Printout_SetPPIPrinter(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Printout_GetPPIPrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_GetPPIPrinter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_GetPPIPrinter",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22209,21 +22318,17 @@ static PyObject *_wrap_Printout_GetPPIPrinter(PyObject *self, PyObject *args, Py
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Printout_IsPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_IsPreview(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     bool result;
@@ -22251,7 +22356,7 @@ static PyObject *_wrap_Printout_IsPreview(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Printout_SetIsPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_SetIsPreview(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     bool arg2 ;
@@ -22264,7 +22369,7 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_SetIsPreview",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22280,7 +22385,7 @@ static PyObject *_wrap_Printout_SetIsPreview(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -22296,9 +22401,9 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Printout_base_OnBeginDocument",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22316,7 +22421,7 @@ static PyObject *_wrap_Printout_base_OnBeginDocument(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22341,7 +22446,7 @@ static PyObject *_wrap_Printout_base_OnEndDocument(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22366,7 +22471,7 @@ static PyObject *_wrap_Printout_base_OnBeginPrinting(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22391,7 +22496,7 @@ static PyObject *_wrap_Printout_base_OnEndPrinting(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22416,7 +22521,7 @@ static PyObject *_wrap_Printout_base_OnPreparePrinting(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_HasPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int arg2 ;
@@ -22430,7 +22535,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Printout_base_HasPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22448,7 +22553,7 @@ static PyObject *_wrap_Printout_base_HasPage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     int *arg2 = (int *) 0 ;
@@ -22456,18 +22561,22 @@ static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *self, PyObject *args,
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Printout_base_GetPageInfo",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22479,36 +22588,28 @@ static PyObject *_wrap_Printout_base_GetPageInfo(PyObject *self, PyObject *args,
         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);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * Printout_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Printout_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPrintout, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreviewCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -22551,7 +22652,7 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -22584,14 +22685,14 @@ static PyObject *_wrap_new_PreviewCanvas(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * PreviewCanvas_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PreviewCanvas_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPreviewCanvas, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreviewFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -22642,7 +22743,7 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -22683,7 +22784,7 @@ static PyObject *_wrap_new_PreviewFrame(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PreviewFrame_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewFrame_Initialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewFrame *arg1 = (wxPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22708,7 +22809,7 @@ static PyObject *_wrap_PreviewFrame_Initialize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PreviewFrame_CreateControlBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewFrame_CreateControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewFrame *arg1 = (wxPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22733,7 +22834,7 @@ static PyObject *_wrap_PreviewFrame_CreateControlBar(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PreviewFrame_CreateCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewFrame_CreateCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewFrame *arg1 = (wxPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22758,7 +22859,7 @@ static PyObject *_wrap_PreviewFrame_CreateCanvas(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PreviewFrame_GetControlBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewFrame_GetControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewFrame *arg1 = (wxPreviewFrame *) 0 ;
     wxPreviewControlBar *result;
@@ -22784,14 +22885,14 @@ static PyObject *_wrap_PreviewFrame_GetControlBar(PyObject *self, PyObject *args
 }
 
 
-static PyObject * PreviewFrame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PreviewFrame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPreviewFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreviewControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     long arg2 ;
@@ -22821,7 +22922,7 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -22838,7 +22939,7 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -22871,7 +22972,7 @@ static PyObject *_wrap_new_PreviewControlBar(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PreviewControlBar_GetZoomControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_GetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     int result;
@@ -22890,14 +22991,14 @@ static PyObject *_wrap_PreviewControlBar_GetZoomControl(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     int arg2 ;
@@ -22910,7 +23011,7 @@ static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PreviewControlBar_SetZoomControl",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPreviewControlBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -22926,7 +23027,7 @@ static PyObject *_wrap_PreviewControlBar_SetZoomControl(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PreviewControlBar_GetPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_GetPrintPreview(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     wxPrintPreview *result;
@@ -22952,7 +23053,7 @@ static PyObject *_wrap_PreviewControlBar_GetPrintPreview(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PreviewControlBar_OnNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_OnNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -22977,7 +23078,7 @@ static PyObject *_wrap_PreviewControlBar_OnNext(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PreviewControlBar_OnPrevious(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_OnPrevious(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23002,7 +23103,7 @@ static PyObject *_wrap_PreviewControlBar_OnPrevious(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PreviewControlBar_OnFirst(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_OnFirst(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23027,7 +23128,7 @@ static PyObject *_wrap_PreviewControlBar_OnFirst(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PreviewControlBar_OnLast(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_OnLast(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23052,7 +23153,7 @@ static PyObject *_wrap_PreviewControlBar_OnLast(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PreviewControlBar_OnGoto(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PreviewControlBar_OnGoto(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPreviewControlBar *arg1 = (wxPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23077,14 +23178,14 @@ static PyObject *_wrap_PreviewControlBar_OnGoto(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * PreviewControlBar_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PreviewControlBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPreviewControlBar, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
@@ -23118,7 +23219,7 @@ static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *self, PyObject *args)
 }
 
 
-static PyObject *_wrap_new_PrintPreview__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PrintPreview__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
@@ -23242,7 +23343,7 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int arg2 ;
@@ -23256,7 +23357,7 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23274,7 +23375,7 @@ static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PrintPreview_GetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int result;
@@ -23293,14 +23394,14 @@ static PyObject *_wrap_PrintPreview_GetCurrentPage(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintPreview_SetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_SetPrintout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
@@ -23329,7 +23430,7 @@ static PyObject *_wrap_PrintPreview_SetPrintout(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPyPrintout *result;
@@ -23357,7 +23458,7 @@ static PyObject *_wrap_PrintPreview_GetPrintout(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPyPrintout *result;
@@ -23385,7 +23486,7 @@ static PyObject *_wrap_PrintPreview_GetPrintoutForPrinting(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PrintPreview_SetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_SetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -23414,7 +23515,7 @@ static PyObject *_wrap_PrintPreview_SetFrame(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PrintPreview_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_SetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -23443,7 +23544,7 @@ static PyObject *_wrap_PrintPreview_SetCanvas(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintPreview_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxFrame *result;
@@ -23471,7 +23572,7 @@ static PyObject *_wrap_PrintPreview_GetFrame(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_PrintPreview_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPreviewCanvas *result;
@@ -23497,7 +23598,7 @@ static PyObject *_wrap_PrintPreview_GetCanvas(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintPreview_PaintPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_PaintPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -23538,7 +23639,7 @@ static PyObject *_wrap_PrintPreview_PaintPage(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -23579,7 +23680,7 @@ static PyObject *_wrap_PrintPreview_DrawBlankPage(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_RenderPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int arg2 ;
@@ -23593,7 +23694,7 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_RenderPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23611,7 +23712,7 @@ static PyObject *_wrap_PrintPreview_RenderPage(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PrintPreview_AdjustScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_AdjustScrollbars(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -23640,7 +23741,7 @@ static PyObject *_wrap_PrintPreview_AdjustScrollbars(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PrintPreview_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetPrintDialogData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxPrintDialogData *result;
@@ -23669,7 +23770,7 @@ static PyObject *_wrap_PrintPreview_GetPrintDialogData(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PrintPreview_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int arg2 ;
@@ -23682,7 +23783,7 @@ static PyObject *_wrap_PrintPreview_SetZoom(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetZoom",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23698,7 +23799,7 @@ static PyObject *_wrap_PrintPreview_SetZoom(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PrintPreview_GetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int result;
@@ -23717,14 +23818,14 @@ static PyObject *_wrap_PrintPreview_GetZoom(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintPreview_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetMaxPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int result;
@@ -23743,14 +23844,14 @@ static PyObject *_wrap_PrintPreview_GetMaxPage(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintPreview_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_GetMinPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     int result;
@@ -23769,14 +23870,14 @@ static PyObject *_wrap_PrintPreview_GetMinPage(PyObject *self, PyObject *args, P
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PrintPreview_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_Ok(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     bool result;
@@ -23804,7 +23905,7 @@ static PyObject *_wrap_PrintPreview_Ok(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_PrintPreview_SetOk(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_SetOk(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     bool arg2 ;
@@ -23817,7 +23918,7 @@ static PyObject *_wrap_PrintPreview_SetOk(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_SetOk",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23833,7 +23934,7 @@ static PyObject *_wrap_PrintPreview_SetOk(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_Print(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     bool arg2 ;
@@ -23847,7 +23948,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PrintPreview_Print",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -23865,7 +23966,7 @@ static PyObject *_wrap_PrintPreview_Print(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PrintPreview_DetermineScaling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PrintPreview_DetermineScaling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     PyObject * obj0 = 0 ;
@@ -23890,14 +23991,14 @@ static PyObject *_wrap_PrintPreview_DetermineScaling(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PrintPreview_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PrintPreview_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPrintPreview, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
@@ -23931,7 +24032,7 @@ static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_new_PyPrintPreview__SWIG_1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_PyPrintPreview__SWIG_1(PyObject *, PyObject *args) {
     PyObject *resultobj;
     wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
     wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
@@ -24055,7 +24156,7 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) {
 }
 
 
-static PyObject *_wrap_PyPrintPreview__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -24086,7 +24187,7 @@ static PyObject *_wrap_PyPrintPreview__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     int arg2 ;
@@ -24100,7 +24201,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetCurrentPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24118,7 +24219,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetCurrentPage(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -24159,7 +24260,7 @@ static PyObject *_wrap_PyPrintPreview_base_PaintPage(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -24200,7 +24301,7 @@ static PyObject *_wrap_PyPrintPreview_base_DrawBlankPage(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     int arg2 ;
@@ -24214,7 +24315,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_RenderPage",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24232,7 +24333,7 @@ static PyObject *_wrap_PyPrintPreview_base_RenderPage(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     int arg2 ;
@@ -24245,7 +24346,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_SetZoom",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24261,7 +24362,7 @@ static PyObject *_wrap_PyPrintPreview_base_SetZoom(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     bool arg2 ;
@@ -24275,7 +24376,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPrintPreview_base_Print",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24293,7 +24394,7 @@ static PyObject *_wrap_PyPrintPreview_base_Print(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24318,14 +24419,14 @@ static PyObject *_wrap_PyPrintPreview_base_DetermineScaling(PyObject *self, PyOb
 }
 
 
-static PyObject * PyPrintPreview_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyPrintPreview_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPrintPreview, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyPreviewFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -24376,7 +24477,7 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -24417,7 +24518,7 @@ static PyObject *_wrap_new_PyPreviewFrame(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_PyPreviewFrame__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -24448,7 +24549,7 @@ static PyObject *_wrap_PyPreviewFrame__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_SetPreviewCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_SetPreviewCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     wxPreviewCanvas *arg2 = (wxPreviewCanvas *) 0 ;
@@ -24477,7 +24578,7 @@ static PyObject *_wrap_PyPreviewFrame_SetPreviewCanvas(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_SetControlBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_SetControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     wxPreviewControlBar *arg2 = (wxPreviewControlBar *) 0 ;
@@ -24506,7 +24607,7 @@ static PyObject *_wrap_PyPreviewFrame_SetControlBar(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24531,7 +24632,7 @@ static PyObject *_wrap_PyPreviewFrame_base_Initialize(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24556,7 +24657,7 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateCanvas(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewFrame *arg1 = (wxPyPreviewFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24581,14 +24682,14 @@ static PyObject *_wrap_PyPreviewFrame_base_CreateControlBar(PyObject *self, PyOb
 }
 
 
-static PyObject * PyPreviewFrame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyPreviewFrame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPreviewFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyPreviewControlBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
     long arg2 ;
@@ -24618,7 +24719,7 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOO:new_PyPreviewControlBar",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintPreview,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (long) SWIG_AsLong(obj1); 
+    arg2 = (long)SWIG_As_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -24635,7 +24736,7 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -24668,7 +24769,7 @@ static PyObject *_wrap_new_PyPreviewControlBar(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyPreviewControlBar__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewControlBar__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -24699,7 +24800,7 @@ static PyObject *_wrap_PyPreviewControlBar__setCallbackInfo(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ;
     wxPrintPreview *arg2 = (wxPrintPreview *) 0 ;
@@ -24728,7 +24829,7 @@ static PyObject *_wrap_PyPreviewControlBar_SetPrintPreview(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ;
     PyObject * obj0 = 0 ;
@@ -24753,7 +24854,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_CreateButtons(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyPreviewControlBar *arg1 = (wxPyPreviewControlBar *) 0 ;
     int arg2 ;
@@ -24766,7 +24867,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *self, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyPreviewControlBar_base_SetZoomControl",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPreviewControlBar,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -24782,7 +24883,7 @@ static PyObject *_wrap_PyPreviewControlBar_base_SetZoomControl(PyObject *self, P
 }
 
 
-static PyObject * PyPreviewControlBar_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyPreviewControlBar_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyPreviewControlBar, obj);
@@ -24790,708 +24891,709 @@ static PyObject * PyPreviewControlBar_swigregister(PyObject *self, PyObject *arg
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_Panel", (PyCFunction) _wrap_new_Panel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePanel", (PyCFunction) _wrap_new_PrePanel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Panel_Create", (PyCFunction) _wrap_Panel_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Panel_InitDialog", (PyCFunction) _wrap_Panel_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Panel_GetClassDefaultAttributes", (PyCFunction) _wrap_Panel_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Panel_swigregister", Panel_swigregister, METH_VARARGS },
-        { (char *)"new_ScrolledWindow", (PyCFunction) _wrap_new_ScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreScrolledWindow", (PyCFunction) _wrap_new_PreScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_Create", (PyCFunction) _wrap_ScrolledWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_SetScrollbars", (PyCFunction) _wrap_ScrolledWindow_SetScrollbars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_Scroll", (PyCFunction) _wrap_ScrolledWindow_Scroll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetScrollPageSize", (PyCFunction) _wrap_ScrolledWindow_GetScrollPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_SetScrollPageSize", (PyCFunction) _wrap_ScrolledWindow_SetScrollPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_SetScrollRate", (PyCFunction) _wrap_ScrolledWindow_SetScrollRate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetScrollPixelsPerUnit", (PyCFunction) _wrap_ScrolledWindow_GetScrollPixelsPerUnit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_EnableScrolling", (PyCFunction) _wrap_ScrolledWindow_EnableScrolling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetViewStart", (PyCFunction) _wrap_ScrolledWindow_GetViewStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_SetScale", (PyCFunction) _wrap_ScrolledWindow_SetScale, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetScaleX", (PyCFunction) _wrap_ScrolledWindow_GetScaleX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetScaleY", (PyCFunction) _wrap_ScrolledWindow_GetScaleY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_CalcScrolledPosition", _wrap_ScrolledWindow_CalcScrolledPosition, METH_VARARGS },
-        { (char *)"ScrolledWindow_CalcUnscrolledPosition", _wrap_ScrolledWindow_CalcUnscrolledPosition, METH_VARARGS },
-        { (char *)"ScrolledWindow_AdjustScrollbars", (PyCFunction) _wrap_ScrolledWindow_AdjustScrollbars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_CalcScrollInc", (PyCFunction) _wrap_ScrolledWindow_CalcScrollInc, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_SetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_SetTargetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_GetTargetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_SetTargetRect", (PyCFunction) _wrap_ScrolledWindow_SetTargetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetTargetRect", (PyCFunction) _wrap_ScrolledWindow_GetTargetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_DoPrepareDC", (PyCFunction) _wrap_ScrolledWindow_DoPrepareDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_ScrolledWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ScrolledWindow_swigregister", ScrolledWindow_swigregister, METH_VARARGS },
-        { (char *)"TopLevelWindow_Maximize", (PyCFunction) _wrap_TopLevelWindow_Maximize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_Restore", (PyCFunction) _wrap_TopLevelWindow_Restore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_Iconize", (PyCFunction) _wrap_TopLevelWindow_Iconize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_IsMaximized", (PyCFunction) _wrap_TopLevelWindow_IsMaximized, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_IsIconized", (PyCFunction) _wrap_TopLevelWindow_IsIconized, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_GetIcon", (PyCFunction) _wrap_TopLevelWindow_GetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_SetIcon", (PyCFunction) _wrap_TopLevelWindow_SetIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_SetIcons", (PyCFunction) _wrap_TopLevelWindow_SetIcons, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_ShowFullScreen", (PyCFunction) _wrap_TopLevelWindow_ShowFullScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_IsFullScreen", (PyCFunction) _wrap_TopLevelWindow_IsFullScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_SetTitle", (PyCFunction) _wrap_TopLevelWindow_SetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_GetTitle", (PyCFunction) _wrap_TopLevelWindow_GetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_SetShape", (PyCFunction) _wrap_TopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_MacSetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacSetMetalAppearance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_MacGetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacGetMetalAppearance, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TopLevelWindow_swigregister", TopLevelWindow_swigregister, METH_VARARGS },
-        { (char *)"new_Frame", (PyCFunction) _wrap_new_Frame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreFrame", (PyCFunction) _wrap_new_PreFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_Create", (PyCFunction) _wrap_Frame_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_GetClientAreaOrigin", (PyCFunction) _wrap_Frame_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SendSizeEvent", (PyCFunction) _wrap_Frame_SendSizeEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SetMenuBar", (PyCFunction) _wrap_Frame_SetMenuBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_GetMenuBar", (PyCFunction) _wrap_Frame_GetMenuBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_ProcessCommand", (PyCFunction) _wrap_Frame_ProcessCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_CreateStatusBar", (PyCFunction) _wrap_Frame_CreateStatusBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_GetStatusBar", (PyCFunction) _wrap_Frame_GetStatusBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SetStatusBar", (PyCFunction) _wrap_Frame_SetStatusBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SetStatusText", (PyCFunction) _wrap_Frame_SetStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SetStatusWidths", (PyCFunction) _wrap_Frame_SetStatusWidths, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_PushStatusText", (PyCFunction) _wrap_Frame_PushStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_PopStatusText", (PyCFunction) _wrap_Frame_PopStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SetStatusBarPane", (PyCFunction) _wrap_Frame_SetStatusBarPane, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_GetStatusBarPane", (PyCFunction) _wrap_Frame_GetStatusBarPane, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_CreateToolBar", (PyCFunction) _wrap_Frame_CreateToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_GetToolBar", (PyCFunction) _wrap_Frame_GetToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_SetToolBar", (PyCFunction) _wrap_Frame_SetToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_DoGiveHelp", (PyCFunction) _wrap_Frame_DoGiveHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_DoMenuUpdates", (PyCFunction) _wrap_Frame_DoMenuUpdates, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_GetClassDefaultAttributes", (PyCFunction) _wrap_Frame_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Frame_swigregister", Frame_swigregister, METH_VARARGS },
-        { (char *)"new_Dialog", (PyCFunction) _wrap_new_Dialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreDialog", (PyCFunction) _wrap_new_PreDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_Create", (PyCFunction) _wrap_Dialog_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_SetReturnCode", (PyCFunction) _wrap_Dialog_SetReturnCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_GetClassDefaultAttributes", (PyCFunction) _wrap_Dialog_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Dialog_swigregister", Dialog_swigregister, METH_VARARGS },
-        { (char *)"new_MiniFrame", (PyCFunction) _wrap_new_MiniFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreMiniFrame", (PyCFunction) _wrap_new_PreMiniFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MiniFrame_Create", (PyCFunction) _wrap_MiniFrame_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MiniFrame_swigregister", MiniFrame_swigregister, METH_VARARGS },
-        { (char *)"new_SplashScreenWindow", (PyCFunction) _wrap_new_SplashScreenWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreenWindow_SetBitmap", (PyCFunction) _wrap_SplashScreenWindow_SetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreenWindow_GetBitmap", (PyCFunction) _wrap_SplashScreenWindow_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreenWindow_swigregister", SplashScreenWindow_swigregister, METH_VARARGS },
-        { (char *)"new_SplashScreen", (PyCFunction) _wrap_new_SplashScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreen_GetSplashStyle", (PyCFunction) _wrap_SplashScreen_GetSplashStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreen_GetSplashWindow", (PyCFunction) _wrap_SplashScreen_GetSplashWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreen_GetTimeout", (PyCFunction) _wrap_SplashScreen_GetTimeout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplashScreen_swigregister", SplashScreen_swigregister, METH_VARARGS },
-        { (char *)"new_StatusBar", (PyCFunction) _wrap_new_StatusBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreStatusBar", (PyCFunction) _wrap_new_PreStatusBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_Create", (PyCFunction) _wrap_StatusBar_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_SetFieldsCount", (PyCFunction) _wrap_StatusBar_SetFieldsCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_GetFieldsCount", (PyCFunction) _wrap_StatusBar_GetFieldsCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_SetStatusText", (PyCFunction) _wrap_StatusBar_SetStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_GetStatusText", (PyCFunction) _wrap_StatusBar_GetStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_PushStatusText", (PyCFunction) _wrap_StatusBar_PushStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_PopStatusText", (PyCFunction) _wrap_StatusBar_PopStatusText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_SetStatusWidths", (PyCFunction) _wrap_StatusBar_SetStatusWidths, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_SetStatusStyles", (PyCFunction) _wrap_StatusBar_SetStatusStyles, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_GetFieldRect", (PyCFunction) _wrap_StatusBar_GetFieldRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_SetMinHeight", (PyCFunction) _wrap_StatusBar_SetMinHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_GetBorderX", (PyCFunction) _wrap_StatusBar_GetBorderX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_GetBorderY", (PyCFunction) _wrap_StatusBar_GetBorderY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_GetClassDefaultAttributes", (PyCFunction) _wrap_StatusBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"StatusBar_swigregister", StatusBar_swigregister, METH_VARARGS },
-        { (char *)"new_SplitterWindow", (PyCFunction) _wrap_new_SplitterWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSplitterWindow", (PyCFunction) _wrap_new_PreSplitterWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_Create", (PyCFunction) _wrap_SplitterWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetWindow1", (PyCFunction) _wrap_SplitterWindow_GetWindow1, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetWindow2", (PyCFunction) _wrap_SplitterWindow_GetWindow2, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SetSplitMode", (PyCFunction) _wrap_SplitterWindow_SetSplitMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetSplitMode", (PyCFunction) _wrap_SplitterWindow_GetSplitMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_Initialize", (PyCFunction) _wrap_SplitterWindow_Initialize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SplitVertically", (PyCFunction) _wrap_SplitterWindow_SplitVertically, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SplitHorizontally", (PyCFunction) _wrap_SplitterWindow_SplitHorizontally, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_Unsplit", (PyCFunction) _wrap_SplitterWindow_Unsplit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_ReplaceWindow", (PyCFunction) _wrap_SplitterWindow_ReplaceWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_UpdateSize", (PyCFunction) _wrap_SplitterWindow_UpdateSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_IsSplit", (PyCFunction) _wrap_SplitterWindow_IsSplit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SetSashSize", (PyCFunction) _wrap_SplitterWindow_SetSashSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SetBorderSize", (PyCFunction) _wrap_SplitterWindow_SetBorderSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetSashSize", (PyCFunction) _wrap_SplitterWindow_GetSashSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetBorderSize", (PyCFunction) _wrap_SplitterWindow_GetBorderSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SetSashPosition", (PyCFunction) _wrap_SplitterWindow_SetSashPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetSashPosition", (PyCFunction) _wrap_SplitterWindow_GetSashPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SetMinimumPaneSize", (PyCFunction) _wrap_SplitterWindow_SetMinimumPaneSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetMinimumPaneSize", (PyCFunction) _wrap_SplitterWindow_GetMinimumPaneSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SashHitTest", (PyCFunction) _wrap_SplitterWindow_SashHitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SizeWindows", (PyCFunction) _wrap_SplitterWindow_SizeWindows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_SetNeedUpdating", (PyCFunction) _wrap_SplitterWindow_SetNeedUpdating, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetNeedUpdating", (PyCFunction) _wrap_SplitterWindow_GetNeedUpdating, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_SplitterWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterWindow_swigregister", SplitterWindow_swigregister, METH_VARARGS },
-        { (char *)"new_SplitterEvent", (PyCFunction) _wrap_new_SplitterEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterEvent_SetSashPosition", (PyCFunction) _wrap_SplitterEvent_SetSashPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterEvent_GetSashPosition", (PyCFunction) _wrap_SplitterEvent_GetSashPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterEvent_GetWindowBeingRemoved", (PyCFunction) _wrap_SplitterEvent_GetWindowBeingRemoved, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterEvent_GetX", (PyCFunction) _wrap_SplitterEvent_GetX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterEvent_GetY", (PyCFunction) _wrap_SplitterEvent_GetY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SplitterEvent_swigregister", SplitterEvent_swigregister, METH_VARARGS },
-        { (char *)"new_SashWindow", (PyCFunction) _wrap_new_SashWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSashWindow", (PyCFunction) _wrap_new_PreSashWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_Create", (PyCFunction) _wrap_SashWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetSashVisible", (PyCFunction) _wrap_SashWindow_SetSashVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetSashVisible", (PyCFunction) _wrap_SashWindow_GetSashVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetSashBorder", (PyCFunction) _wrap_SashWindow_SetSashBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_HasBorder", (PyCFunction) _wrap_SashWindow_HasBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetEdgeMargin", (PyCFunction) _wrap_SashWindow_GetEdgeMargin, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_SetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_GetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetExtraBorderSize", (PyCFunction) _wrap_SashWindow_SetExtraBorderSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetExtraBorderSize", (PyCFunction) _wrap_SashWindow_GetExtraBorderSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetMinimumSizeX", (PyCFunction) _wrap_SashWindow_SetMinimumSizeX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetMinimumSizeY", (PyCFunction) _wrap_SashWindow_SetMinimumSizeY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetMinimumSizeX", (PyCFunction) _wrap_SashWindow_GetMinimumSizeX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetMinimumSizeY", (PyCFunction) _wrap_SashWindow_GetMinimumSizeY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetMaximumSizeX", (PyCFunction) _wrap_SashWindow_SetMaximumSizeX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SetMaximumSizeY", (PyCFunction) _wrap_SashWindow_SetMaximumSizeY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetMaximumSizeX", (PyCFunction) _wrap_SashWindow_GetMaximumSizeX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_GetMaximumSizeY", (PyCFunction) _wrap_SashWindow_GetMaximumSizeY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SashHitTest", (PyCFunction) _wrap_SashWindow_SashHitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_SizeWindows", (PyCFunction) _wrap_SashWindow_SizeWindows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashWindow_swigregister", SashWindow_swigregister, METH_VARARGS },
-        { (char *)"new_SashEvent", (PyCFunction) _wrap_new_SashEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_SetEdge", (PyCFunction) _wrap_SashEvent_SetEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_GetEdge", (PyCFunction) _wrap_SashEvent_GetEdge, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_SetDragRect", (PyCFunction) _wrap_SashEvent_SetDragRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_GetDragRect", (PyCFunction) _wrap_SashEvent_GetDragRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_SetDragStatus", (PyCFunction) _wrap_SashEvent_SetDragStatus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_GetDragStatus", (PyCFunction) _wrap_SashEvent_GetDragStatus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashEvent_swigregister", SashEvent_swigregister, METH_VARARGS },
-        { (char *)"new_QueryLayoutInfoEvent", (PyCFunction) _wrap_new_QueryLayoutInfoEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_SetRequestedLength", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetRequestedLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_GetRequestedLength", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetRequestedLength, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_SetFlags", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_GetFlags", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_SetSize", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_GetSize", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_SetOrientation", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_GetOrientation", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_SetAlignment", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_GetAlignment", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"QueryLayoutInfoEvent_swigregister", QueryLayoutInfoEvent_swigregister, METH_VARARGS },
-        { (char *)"new_CalculateLayoutEvent", (PyCFunction) _wrap_new_CalculateLayoutEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalculateLayoutEvent_SetFlags", (PyCFunction) _wrap_CalculateLayoutEvent_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalculateLayoutEvent_GetFlags", (PyCFunction) _wrap_CalculateLayoutEvent_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalculateLayoutEvent_SetRect", (PyCFunction) _wrap_CalculateLayoutEvent_SetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalculateLayoutEvent_GetRect", (PyCFunction) _wrap_CalculateLayoutEvent_GetRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalculateLayoutEvent_swigregister", CalculateLayoutEvent_swigregister, METH_VARARGS },
-        { (char *)"new_SashLayoutWindow", (PyCFunction) _wrap_new_SashLayoutWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreSashLayoutWindow", (PyCFunction) _wrap_new_PreSashLayoutWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_Create", (PyCFunction) _wrap_SashLayoutWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_GetAlignment", (PyCFunction) _wrap_SashLayoutWindow_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_GetOrientation", (PyCFunction) _wrap_SashLayoutWindow_GetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_SetAlignment", (PyCFunction) _wrap_SashLayoutWindow_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_SetDefaultSize", (PyCFunction) _wrap_SashLayoutWindow_SetDefaultSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_SetOrientation", (PyCFunction) _wrap_SashLayoutWindow_SetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SashLayoutWindow_swigregister", SashLayoutWindow_swigregister, METH_VARARGS },
-        { (char *)"new_LayoutAlgorithm", (PyCFunction) _wrap_new_LayoutAlgorithm, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_LayoutAlgorithm", (PyCFunction) _wrap_delete_LayoutAlgorithm, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutAlgorithm_LayoutMDIFrame", (PyCFunction) _wrap_LayoutAlgorithm_LayoutMDIFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutAlgorithm_LayoutFrame", (PyCFunction) _wrap_LayoutAlgorithm_LayoutFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutAlgorithm_LayoutWindow", (PyCFunction) _wrap_LayoutAlgorithm_LayoutWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"LayoutAlgorithm_swigregister", LayoutAlgorithm_swigregister, METH_VARARGS },
-        { (char *)"new_PopupWindow", (PyCFunction) _wrap_new_PopupWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePopupWindow", (PyCFunction) _wrap_new_PrePopupWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PopupWindow_swigregister", PopupWindow_swigregister, METH_VARARGS },
-        { (char *)"new_PopupTransientWindow", (PyCFunction) _wrap_new_PopupTransientWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePopupTransientWindow", (PyCFunction) _wrap_new_PrePopupTransientWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PopupTransientWindow_swigregister", PopupTransientWindow_swigregister, METH_VARARGS },
-        { (char *)"new_TipWindow", (PyCFunction) _wrap_new_TipWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipWindow_SetBoundingRect", (PyCFunction) _wrap_TipWindow_SetBoundingRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipWindow_Close", (PyCFunction) _wrap_TipWindow_Close, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TipWindow_swigregister", TipWindow_swigregister, METH_VARARGS },
-        { (char *)"new_VScrolledWindow", (PyCFunction) _wrap_new_VScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreVScrolledWindow", (PyCFunction) _wrap_new_PreVScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_VScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_Create", (PyCFunction) _wrap_VScrolledWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_SetLineCount", (PyCFunction) _wrap_VScrolledWindow_SetLineCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_ScrollToLine", (PyCFunction) _wrap_VScrolledWindow_ScrollToLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_ScrollLines", (PyCFunction) _wrap_VScrolledWindow_ScrollLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_ScrollPages", (PyCFunction) _wrap_VScrolledWindow_ScrollPages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_RefreshLine", (PyCFunction) _wrap_VScrolledWindow_RefreshLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_RefreshLines", (PyCFunction) _wrap_VScrolledWindow_RefreshLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_HitTestXY", (PyCFunction) _wrap_VScrolledWindow_HitTestXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_HitTest", (PyCFunction) _wrap_VScrolledWindow_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_RefreshAll", (PyCFunction) _wrap_VScrolledWindow_RefreshAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_GetLineCount", (PyCFunction) _wrap_VScrolledWindow_GetLineCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_GetFirstVisibleLine", (PyCFunction) _wrap_VScrolledWindow_GetFirstVisibleLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_GetLastVisibleLine", (PyCFunction) _wrap_VScrolledWindow_GetLastVisibleLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_IsVisible", (PyCFunction) _wrap_VScrolledWindow_IsVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VScrolledWindow_swigregister", VScrolledWindow_swigregister, METH_VARARGS },
-        { (char *)"new_VListBox", (PyCFunction) _wrap_new_VListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreVListBox", (PyCFunction) _wrap_new_PreVListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox__setCallbackInfo", (PyCFunction) _wrap_VListBox__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_Create", (PyCFunction) _wrap_VListBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetItemCount", (PyCFunction) _wrap_VListBox_GetItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_HasMultipleSelection", (PyCFunction) _wrap_VListBox_HasMultipleSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetSelection", (PyCFunction) _wrap_VListBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_IsCurrent", (PyCFunction) _wrap_VListBox_IsCurrent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_IsSelected", (PyCFunction) _wrap_VListBox_IsSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetSelectedCount", (PyCFunction) _wrap_VListBox_GetSelectedCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetFirstSelected", (PyCFunction) _wrap_VListBox_GetFirstSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetNextSelected", (PyCFunction) _wrap_VListBox_GetNextSelected, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetMargins", (PyCFunction) _wrap_VListBox_GetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_GetSelectionBackground", (PyCFunction) _wrap_VListBox_GetSelectionBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SetItemCount", (PyCFunction) _wrap_VListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_Clear", (PyCFunction) _wrap_VListBox_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SetSelection", (PyCFunction) _wrap_VListBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_Select", (PyCFunction) _wrap_VListBox_Select, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SelectRange", (PyCFunction) _wrap_VListBox_SelectRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_Toggle", (PyCFunction) _wrap_VListBox_Toggle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SelectAll", (PyCFunction) _wrap_VListBox_SelectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_DeselectAll", (PyCFunction) _wrap_VListBox_DeselectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SetMargins", (PyCFunction) _wrap_VListBox_SetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SetMarginsXY", (PyCFunction) _wrap_VListBox_SetMarginsXY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_SetSelectionBackground", (PyCFunction) _wrap_VListBox_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"VListBox_swigregister", VListBox_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlListBox", (PyCFunction) _wrap_new_HtmlListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreHtmlListBox", (PyCFunction) _wrap_new_PreHtmlListBox, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlListBox__setCallbackInfo", (PyCFunction) _wrap_HtmlListBox__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlListBox_RefreshAll", (PyCFunction) _wrap_HtmlListBox_RefreshAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS },
-        { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TaskBarIcon_swigregister", TaskBarIcon_swigregister, METH_VARARGS },
-        { (char *)"new_TaskBarIconEvent", (PyCFunction) _wrap_new_TaskBarIconEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TaskBarIconEvent_swigregister", TaskBarIconEvent_swigregister, METH_VARARGS },
-        { (char *)"new_ColourData", (PyCFunction) _wrap_new_ColourData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_ColourData", (PyCFunction) _wrap_delete_ColourData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_GetChooseFull", (PyCFunction) _wrap_ColourData_GetChooseFull, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_GetColour", (PyCFunction) _wrap_ColourData_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_GetCustomColour", (PyCFunction) _wrap_ColourData_GetCustomColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_SetChooseFull", (PyCFunction) _wrap_ColourData_SetChooseFull, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_SetColour", (PyCFunction) _wrap_ColourData_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_SetCustomColour", (PyCFunction) _wrap_ColourData_SetCustomColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourData_swigregister", ColourData_swigregister, METH_VARARGS },
-        { (char *)"new_ColourDialog", (PyCFunction) _wrap_new_ColourDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDialog_GetColourData", (PyCFunction) _wrap_ColourDialog_GetColourData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ColourDialog_swigregister", ColourDialog_swigregister, METH_VARARGS },
-        { (char *)"new_DirDialog", (PyCFunction) _wrap_new_DirDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirDialog_GetPath", (PyCFunction) _wrap_DirDialog_GetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirDialog_GetMessage", (PyCFunction) _wrap_DirDialog_GetMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirDialog_GetStyle", (PyCFunction) _wrap_DirDialog_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirDialog_SetMessage", (PyCFunction) _wrap_DirDialog_SetMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirDialog_SetPath", (PyCFunction) _wrap_DirDialog_SetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DirDialog_swigregister", DirDialog_swigregister, METH_VARARGS },
-        { (char *)"new_FileDialog", (PyCFunction) _wrap_new_FileDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetMessage", (PyCFunction) _wrap_FileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetPath", (PyCFunction) _wrap_FileDialog_SetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetDirectory", (PyCFunction) _wrap_FileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetFilename", (PyCFunction) _wrap_FileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetWildcard", (PyCFunction) _wrap_FileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetStyle", (PyCFunction) _wrap_FileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_SetFilterIndex", (PyCFunction) _wrap_FileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetMessage", (PyCFunction) _wrap_FileDialog_GetMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetPath", (PyCFunction) _wrap_FileDialog_GetPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetDirectory", (PyCFunction) _wrap_FileDialog_GetDirectory, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetFilename", (PyCFunction) _wrap_FileDialog_GetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetWildcard", (PyCFunction) _wrap_FileDialog_GetWildcard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetStyle", (PyCFunction) _wrap_FileDialog_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetFilterIndex", (PyCFunction) _wrap_FileDialog_GetFilterIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetFilenames", (PyCFunction) _wrap_FileDialog_GetFilenames, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_GetPaths", (PyCFunction) _wrap_FileDialog_GetPaths, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FileDialog_swigregister", FileDialog_swigregister, METH_VARARGS },
-        { (char *)"new_MultiChoiceDialog", (PyCFunction) _wrap_new_MultiChoiceDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MultiChoiceDialog_SetSelections", (PyCFunction) _wrap_MultiChoiceDialog_SetSelections, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MultiChoiceDialog_GetSelections", (PyCFunction) _wrap_MultiChoiceDialog_GetSelections, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MultiChoiceDialog_swigregister", MultiChoiceDialog_swigregister, METH_VARARGS },
-        { (char *)"new_SingleChoiceDialog", (PyCFunction) _wrap_new_SingleChoiceDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleChoiceDialog_GetSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleChoiceDialog_SetSelection", (PyCFunction) _wrap_SingleChoiceDialog_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"SingleChoiceDialog_swigregister", SingleChoiceDialog_swigregister, METH_VARARGS },
-        { (char *)"new_TextEntryDialog", (PyCFunction) _wrap_new_TextEntryDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextEntryDialog_GetValue", (PyCFunction) _wrap_TextEntryDialog_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextEntryDialog_SetValue", (PyCFunction) _wrap_TextEntryDialog_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"TextEntryDialog_swigregister", TextEntryDialog_swigregister, METH_VARARGS },
-        { (char *)"new_FontData", (PyCFunction) _wrap_new_FontData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FontData", (PyCFunction) _wrap_delete_FontData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_EnableEffects", (PyCFunction) _wrap_FontData_EnableEffects, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_GetAllowSymbols", (PyCFunction) _wrap_FontData_GetAllowSymbols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_GetColour", (PyCFunction) _wrap_FontData_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_GetChosenFont", (PyCFunction) _wrap_FontData_GetChosenFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_GetEnableEffects", (PyCFunction) _wrap_FontData_GetEnableEffects, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_GetInitialFont", (PyCFunction) _wrap_FontData_GetInitialFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_GetShowHelp", (PyCFunction) _wrap_FontData_GetShowHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_SetAllowSymbols", (PyCFunction) _wrap_FontData_SetAllowSymbols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_SetChosenFont", (PyCFunction) _wrap_FontData_SetChosenFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_SetColour", (PyCFunction) _wrap_FontData_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_SetInitialFont", (PyCFunction) _wrap_FontData_SetInitialFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_SetRange", (PyCFunction) _wrap_FontData_SetRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_SetShowHelp", (PyCFunction) _wrap_FontData_SetShowHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontData_swigregister", FontData_swigregister, METH_VARARGS },
-        { (char *)"new_FontDialog", (PyCFunction) _wrap_new_FontDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontDialog_GetFontData", (PyCFunction) _wrap_FontDialog_GetFontData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FontDialog_swigregister", FontDialog_swigregister, METH_VARARGS },
-        { (char *)"new_MessageDialog", (PyCFunction) _wrap_new_MessageDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MessageDialog_swigregister", MessageDialog_swigregister, METH_VARARGS },
-        { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProgressDialog_Resume", (PyCFunction) _wrap_ProgressDialog_Resume, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS },
-        { (char *)"new_FindDialogEvent", (PyCFunction) _wrap_new_FindDialogEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_GetFlags", (PyCFunction) _wrap_FindDialogEvent_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_GetFindString", (PyCFunction) _wrap_FindDialogEvent_GetFindString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_GetReplaceString", (PyCFunction) _wrap_FindDialogEvent_GetReplaceString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_GetDialog", (PyCFunction) _wrap_FindDialogEvent_GetDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_SetFlags", (PyCFunction) _wrap_FindDialogEvent_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_SetFindString", (PyCFunction) _wrap_FindDialogEvent_SetFindString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_SetReplaceString", (PyCFunction) _wrap_FindDialogEvent_SetReplaceString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindDialogEvent_swigregister", FindDialogEvent_swigregister, METH_VARARGS },
-        { (char *)"new_FindReplaceData", (PyCFunction) _wrap_new_FindReplaceData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_FindReplaceData", (PyCFunction) _wrap_delete_FindReplaceData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_GetFindString", (PyCFunction) _wrap_FindReplaceData_GetFindString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_GetReplaceString", (PyCFunction) _wrap_FindReplaceData_GetReplaceString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_GetFlags", (PyCFunction) _wrap_FindReplaceData_GetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_SetFlags", (PyCFunction) _wrap_FindReplaceData_SetFlags, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_SetFindString", (PyCFunction) _wrap_FindReplaceData_SetFindString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_SetReplaceString", (PyCFunction) _wrap_FindReplaceData_SetReplaceString, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceData_swigregister", FindReplaceData_swigregister, METH_VARARGS },
-        { (char *)"new_FindReplaceDialog", (PyCFunction) _wrap_new_FindReplaceDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreFindReplaceDialog", (PyCFunction) _wrap_new_PreFindReplaceDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceDialog_Create", (PyCFunction) _wrap_FindReplaceDialog_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceDialog_GetData", (PyCFunction) _wrap_FindReplaceDialog_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceDialog_SetData", (PyCFunction) _wrap_FindReplaceDialog_SetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"FindReplaceDialog_swigregister", FindReplaceDialog_swigregister, METH_VARARGS },
-        { (char *)"new_MDIParentFrame", (PyCFunction) _wrap_new_MDIParentFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreMDIParentFrame", (PyCFunction) _wrap_new_PreMDIParentFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_Create", (PyCFunction) _wrap_MDIParentFrame_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_ActivateNext", (PyCFunction) _wrap_MDIParentFrame_ActivateNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_ActivatePrevious", (PyCFunction) _wrap_MDIParentFrame_ActivatePrevious, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_ArrangeIcons", (PyCFunction) _wrap_MDIParentFrame_ArrangeIcons, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_Cascade", (PyCFunction) _wrap_MDIParentFrame_Cascade, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction) _wrap_MDIParentFrame_GetActiveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction) _wrap_MDIParentFrame_GetClientWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_GetToolBar", (PyCFunction) _wrap_MDIParentFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIParentFrame_swigregister", MDIParentFrame_swigregister, METH_VARARGS },
-        { (char *)"new_MDIChildFrame", (PyCFunction) _wrap_new_MDIChildFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreMDIChildFrame", (PyCFunction) _wrap_new_PreMDIChildFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIChildFrame_Create", (PyCFunction) _wrap_MDIChildFrame_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIChildFrame_Activate", (PyCFunction) _wrap_MDIChildFrame_Activate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIChildFrame_Maximize", (PyCFunction) _wrap_MDIChildFrame_Maximize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIChildFrame_Restore", (PyCFunction) _wrap_MDIChildFrame_Restore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIChildFrame_swigregister", MDIChildFrame_swigregister, METH_VARARGS },
-        { (char *)"new_MDIClientWindow", (PyCFunction) _wrap_new_MDIClientWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreMDIClientWindow", (PyCFunction) _wrap_new_PreMDIClientWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIClientWindow_Create", (PyCFunction) _wrap_MDIClientWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"MDIClientWindow_swigregister", MDIClientWindow_swigregister, METH_VARARGS },
-        { (char *)"new_PyWindow", (PyCFunction) _wrap_new_PyWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePyWindow", (PyCFunction) _wrap_new_PrePyWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow__setCallbackInfo", (PyCFunction) _wrap_PyWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_SetBestSize", (PyCFunction) _wrap_PyWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoSetSize", (PyCFunction) _wrap_PyWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoGetSize", (PyCFunction) _wrap_PyWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoGetPosition", (PyCFunction) _wrap_PyWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_InitDialog", (PyCFunction) _wrap_PyWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_Validate", (PyCFunction) _wrap_PyWindow_base_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_GetMaxSize", (PyCFunction) _wrap_PyWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_AddChild", (PyCFunction) _wrap_PyWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_RemoveChild", (PyCFunction) _wrap_PyWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyWindow_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWindow_swigregister", PyWindow_swigregister, METH_VARARGS },
-        { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePyPanel", (PyCFunction) _wrap_new_PrePyPanel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel__setCallbackInfo", (PyCFunction) _wrap_PyPanel__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_SetBestSize", (PyCFunction) _wrap_PyPanel_SetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoMoveWindow", (PyCFunction) _wrap_PyPanel_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoSetSize", (PyCFunction) _wrap_PyPanel_base_DoSetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoSetClientSize", (PyCFunction) _wrap_PyPanel_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoSetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoGetSize", (PyCFunction) _wrap_PyPanel_base_DoGetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoGetClientSize", (PyCFunction) _wrap_PyPanel_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoGetPosition", (PyCFunction) _wrap_PyPanel_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoGetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_DoGetBestSize", (PyCFunction) _wrap_PyPanel_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_InitDialog", (PyCFunction) _wrap_PyPanel_base_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_TransferDataToWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_TransferDataFromWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_Validate", (PyCFunction) _wrap_PyPanel_base_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_AcceptsFocus", (PyCFunction) _wrap_PyPanel_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyPanel_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_GetMaxSize", (PyCFunction) _wrap_PyPanel_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_AddChild", (PyCFunction) _wrap_PyPanel_base_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_RemoveChild", (PyCFunction) _wrap_PyPanel_base_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyPanel_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_base_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPanel_swigregister", PyPanel_swigregister, METH_VARARGS },
-        { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePyScrolledWindow", (PyCFunction) _wrap_new_PrePyScrolledWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_PyScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_SetBestSize", (PyCFunction) _wrap_PyScrolledWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoGetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoGetPosition", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_InitDialog", (PyCFunction) _wrap_PyScrolledWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_Validate", (PyCFunction) _wrap_PyScrolledWindow_base_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_GetMaxSize", (PyCFunction) _wrap_PyScrolledWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_AddChild", (PyCFunction) _wrap_PyScrolledWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyScrolledWindow_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyScrolledWindow_swigregister", PyScrolledWindow_swigregister, METH_VARARGS },
-        { (char *)"new_PrintData", _wrap_new_PrintData, METH_VARARGS },
-        { (char *)"delete_PrintData", (PyCFunction) _wrap_delete_PrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetNoCopies", (PyCFunction) _wrap_PrintData_GetNoCopies, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetCollate", (PyCFunction) _wrap_PrintData_GetCollate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetOrientation", (PyCFunction) _wrap_PrintData_GetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_Ok", (PyCFunction) _wrap_PrintData_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterName", (PyCFunction) _wrap_PrintData_GetPrinterName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetColour", (PyCFunction) _wrap_PrintData_GetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetDuplex", (PyCFunction) _wrap_PrintData_GetDuplex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPaperId", (PyCFunction) _wrap_PrintData_GetPaperId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPaperSize", (PyCFunction) _wrap_PrintData_GetPaperSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetQuality", (PyCFunction) _wrap_PrintData_GetQuality, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterName", (PyCFunction) _wrap_PrintData_SetPrinterName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetColour", (PyCFunction) _wrap_PrintData_SetColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetDuplex", (PyCFunction) _wrap_PrintData_SetDuplex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPaperId", (PyCFunction) _wrap_PrintData_SetPaperId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPaperSize", (PyCFunction) _wrap_PrintData_SetPaperSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterCommand", (PyCFunction) _wrap_PrintData_GetPrinterCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterOptions", (PyCFunction) _wrap_PrintData_GetPrinterOptions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPreviewCommand", (PyCFunction) _wrap_PrintData_GetPreviewCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetFilename", (PyCFunction) _wrap_PrintData_GetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetFontMetricPath", (PyCFunction) _wrap_PrintData_GetFontMetricPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterScaleX", (PyCFunction) _wrap_PrintData_GetPrinterScaleX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterScaleY", (PyCFunction) _wrap_PrintData_GetPrinterScaleY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterTranslateX", (PyCFunction) _wrap_PrintData_GetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrinterTranslateY", (PyCFunction) _wrap_PrintData_GetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetPrintMode", (PyCFunction) _wrap_PrintData_GetPrintMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterCommand", (PyCFunction) _wrap_PrintData_SetPrinterCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterOptions", (PyCFunction) _wrap_PrintData_SetPrinterOptions, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPreviewCommand", (PyCFunction) _wrap_PrintData_SetPreviewCommand, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetFontMetricPath", (PyCFunction) _wrap_PrintData_SetFontMetricPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterScaleX", (PyCFunction) _wrap_PrintData_SetPrinterScaleX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterScaleY", (PyCFunction) _wrap_PrintData_SetPrinterScaleY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterScaling", (PyCFunction) _wrap_PrintData_SetPrinterScaling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterTranslateX", (PyCFunction) _wrap_PrintData_SetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterTranslateY", (PyCFunction) _wrap_PrintData_SetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrinterTranslation", (PyCFunction) _wrap_PrintData_SetPrinterTranslation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_GetOutputStream", (PyCFunction) _wrap_PrintData_GetOutputStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_SetOutputStream", (PyCFunction) _wrap_PrintData_SetOutputStream, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintData_swigregister", PrintData_swigregister, METH_VARARGS },
-        { (char *)"new_PageSetupDialogData", _wrap_new_PageSetupDialogData, METH_VARARGS },
-        { (char *)"delete_PageSetupDialogData", (PyCFunction) _wrap_delete_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_EnableHelp", (PyCFunction) _wrap_PageSetupDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_EnableMargins", (PyCFunction) _wrap_PageSetupDialogData_EnableMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_EnableOrientation", (PyCFunction) _wrap_PageSetupDialogData_EnableOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_EnablePaper", (PyCFunction) _wrap_PageSetupDialogData_EnablePaper, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_EnablePrinter", (PyCFunction) _wrap_PageSetupDialogData_EnablePrinter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetDefaultMinMargins", (PyCFunction) _wrap_PageSetupDialogData_GetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetEnableMargins", (PyCFunction) _wrap_PageSetupDialogData_GetEnableMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetEnableOrientation", (PyCFunction) _wrap_PageSetupDialogData_GetEnableOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetEnablePaper", (PyCFunction) _wrap_PageSetupDialogData_GetEnablePaper, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetEnablePrinter", (PyCFunction) _wrap_PageSetupDialogData_GetEnablePrinter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetEnableHelp", (PyCFunction) _wrap_PageSetupDialogData_GetEnableHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetDefaultInfo", (PyCFunction) _wrap_PageSetupDialogData_GetDefaultInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_GetMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_GetMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetMinMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_GetMinMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetMinMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_GetMinMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetPaperId", (PyCFunction) _wrap_PageSetupDialogData_GetPaperId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetPaperSize", (PyCFunction) _wrap_PageSetupDialogData_GetPaperSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_GetPrintData", (PyCFunction) _wrap_PageSetupDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_Ok", (PyCFunction) _wrap_PageSetupDialogData_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetDefaultInfo", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetDefaultMinMargins", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_SetMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_SetMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetMinMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_SetMinMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetMinMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_SetMinMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetPaperId", (PyCFunction) _wrap_PageSetupDialogData_SetPaperId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetPaperSize", (PyCFunction) _wrap_PageSetupDialogData_SetPaperSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_SetPrintData", (PyCFunction) _wrap_PageSetupDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialogData_swigregister", PageSetupDialogData_swigregister, METH_VARARGS },
-        { (char *)"new_PageSetupDialog", (PyCFunction) _wrap_new_PageSetupDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialog_GetPageSetupData", (PyCFunction) _wrap_PageSetupDialog_GetPageSetupData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialog_ShowModal", (PyCFunction) _wrap_PageSetupDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PageSetupDialog_swigregister", PageSetupDialog_swigregister, METH_VARARGS },
-        { (char *)"new_PrintDialogData", _wrap_new_PrintDialogData, METH_VARARGS },
-        { (char *)"delete_PrintDialogData", (PyCFunction) _wrap_delete_PrintDialogData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetFromPage", (PyCFunction) _wrap_PrintDialogData_GetFromPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetToPage", (PyCFunction) _wrap_PrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetMinPage", (PyCFunction) _wrap_PrintDialogData_GetMinPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetMaxPage", (PyCFunction) _wrap_PrintDialogData_GetMaxPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetNoCopies", (PyCFunction) _wrap_PrintDialogData_GetNoCopies, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetAllPages", (PyCFunction) _wrap_PrintDialogData_GetAllPages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetSelection", (PyCFunction) _wrap_PrintDialogData_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetCollate", (PyCFunction) _wrap_PrintDialogData_GetCollate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetPrintToFile", (PyCFunction) _wrap_PrintDialogData_GetPrintToFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetSetupDialog", (PyCFunction) _wrap_PrintDialogData_GetSetupDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetFromPage", (PyCFunction) _wrap_PrintDialogData_SetFromPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetToPage", (PyCFunction) _wrap_PrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetMinPage", (PyCFunction) _wrap_PrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetMaxPage", (PyCFunction) _wrap_PrintDialogData_SetMaxPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetNoCopies", (PyCFunction) _wrap_PrintDialogData_SetNoCopies, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetAllPages", (PyCFunction) _wrap_PrintDialogData_SetAllPages, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetSelection", (PyCFunction) _wrap_PrintDialogData_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetCollate", (PyCFunction) _wrap_PrintDialogData_SetCollate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetPrintToFile", (PyCFunction) _wrap_PrintDialogData_SetPrintToFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetSetupDialog", (PyCFunction) _wrap_PrintDialogData_SetSetupDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_EnablePrintToFile", (PyCFunction) _wrap_PrintDialogData_EnablePrintToFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_EnableSelection", (PyCFunction) _wrap_PrintDialogData_EnableSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_EnablePageNumbers", (PyCFunction) _wrap_PrintDialogData_EnablePageNumbers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_EnableHelp", (PyCFunction) _wrap_PrintDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetEnablePrintToFile", (PyCFunction) _wrap_PrintDialogData_GetEnablePrintToFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetEnableSelection", (PyCFunction) _wrap_PrintDialogData_GetEnableSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetEnablePageNumbers", (PyCFunction) _wrap_PrintDialogData_GetEnablePageNumbers, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetEnableHelp", (PyCFunction) _wrap_PrintDialogData_GetEnableHelp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_Ok", (PyCFunction) _wrap_PrintDialogData_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_GetPrintData", (PyCFunction) _wrap_PrintDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_SetPrintData", (PyCFunction) _wrap_PrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialogData_swigregister", PrintDialogData_swigregister, METH_VARARGS },
-        { (char *)"new_PrintDialog", (PyCFunction) _wrap_new_PrintDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialog_GetPrintDialogData", (PyCFunction) _wrap_PrintDialog_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialog_GetPrintDC", (PyCFunction) _wrap_PrintDialog_GetPrintDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialog_ShowModal", (PyCFunction) _wrap_PrintDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintDialog_swigregister", PrintDialog_swigregister, METH_VARARGS },
-        { (char *)"new_Printer", (PyCFunction) _wrap_new_Printer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_Printer", (PyCFunction) _wrap_delete_Printer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_CreateAbortWindow", (PyCFunction) _wrap_Printer_CreateAbortWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_GetPrintDialogData", (PyCFunction) _wrap_Printer_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_Print", (PyCFunction) _wrap_Printer_Print, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_PrintDialog", (PyCFunction) _wrap_Printer_PrintDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_ReportError", (PyCFunction) _wrap_Printer_ReportError, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_Setup", (PyCFunction) _wrap_Printer_Setup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_GetAbort", (PyCFunction) _wrap_Printer_GetAbort, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_GetLastError", (PyCFunction) _wrap_Printer_GetLastError, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printer_swigregister", Printer_swigregister, METH_VARARGS },
-        { (char *)"new_Printout", (PyCFunction) _wrap_new_Printout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout__setCallbackInfo", (PyCFunction) _wrap_Printout__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_GetTitle", (PyCFunction) _wrap_Printout_GetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_GetDC", (PyCFunction) _wrap_Printout_GetDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_SetDC", (PyCFunction) _wrap_Printout_SetDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_SetPageSizePixels", (PyCFunction) _wrap_Printout_SetPageSizePixels, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_GetPageSizePixels", (PyCFunction) _wrap_Printout_GetPageSizePixels, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_SetPageSizeMM", (PyCFunction) _wrap_Printout_SetPageSizeMM, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_GetPageSizeMM", (PyCFunction) _wrap_Printout_GetPageSizeMM, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_SetPPIScreen", (PyCFunction) _wrap_Printout_SetPPIScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_GetPPIScreen", (PyCFunction) _wrap_Printout_GetPPIScreen, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_SetPPIPrinter", (PyCFunction) _wrap_Printout_SetPPIPrinter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_GetPPIPrinter", (PyCFunction) _wrap_Printout_GetPPIPrinter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_IsPreview", (PyCFunction) _wrap_Printout_IsPreview, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_SetIsPreview", (PyCFunction) _wrap_Printout_SetIsPreview, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_OnBeginDocument", (PyCFunction) _wrap_Printout_base_OnBeginDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_OnEndDocument", (PyCFunction) _wrap_Printout_base_OnEndDocument, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_OnBeginPrinting", (PyCFunction) _wrap_Printout_base_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_OnEndPrinting", (PyCFunction) _wrap_Printout_base_OnEndPrinting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_OnPreparePrinting", (PyCFunction) _wrap_Printout_base_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_HasPage", (PyCFunction) _wrap_Printout_base_HasPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_base_GetPageInfo", (PyCFunction) _wrap_Printout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Printout_swigregister", Printout_swigregister, METH_VARARGS },
-        { (char *)"new_PreviewCanvas", (PyCFunction) _wrap_new_PreviewCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewCanvas_swigregister", PreviewCanvas_swigregister, METH_VARARGS },
-        { (char *)"new_PreviewFrame", (PyCFunction) _wrap_new_PreviewFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewFrame_Initialize", (PyCFunction) _wrap_PreviewFrame_Initialize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewFrame_CreateControlBar", (PyCFunction) _wrap_PreviewFrame_CreateControlBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewFrame_CreateCanvas", (PyCFunction) _wrap_PreviewFrame_CreateCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewFrame_GetControlBar", (PyCFunction) _wrap_PreviewFrame_GetControlBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewFrame_swigregister", PreviewFrame_swigregister, METH_VARARGS },
-        { (char *)"new_PreviewControlBar", (PyCFunction) _wrap_new_PreviewControlBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_GetZoomControl", (PyCFunction) _wrap_PreviewControlBar_GetZoomControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_SetZoomControl", (PyCFunction) _wrap_PreviewControlBar_SetZoomControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_GetPrintPreview", (PyCFunction) _wrap_PreviewControlBar_GetPrintPreview, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_OnNext", (PyCFunction) _wrap_PreviewControlBar_OnNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_OnPrevious", (PyCFunction) _wrap_PreviewControlBar_OnPrevious, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_OnFirst", (PyCFunction) _wrap_PreviewControlBar_OnFirst, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_OnLast", (PyCFunction) _wrap_PreviewControlBar_OnLast, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_OnGoto", (PyCFunction) _wrap_PreviewControlBar_OnGoto, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PreviewControlBar_swigregister", PreviewControlBar_swigregister, METH_VARARGS },
-        { (char *)"new_PrintPreview", _wrap_new_PrintPreview, METH_VARARGS },
-        { (char *)"PrintPreview_SetCurrentPage", (PyCFunction) _wrap_PrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetCurrentPage", (PyCFunction) _wrap_PrintPreview_GetCurrentPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_SetPrintout", (PyCFunction) _wrap_PrintPreview_SetPrintout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetPrintout", (PyCFunction) _wrap_PrintPreview_GetPrintout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetPrintoutForPrinting", (PyCFunction) _wrap_PrintPreview_GetPrintoutForPrinting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_SetFrame", (PyCFunction) _wrap_PrintPreview_SetFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_SetCanvas", (PyCFunction) _wrap_PrintPreview_SetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetFrame", (PyCFunction) _wrap_PrintPreview_GetFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetCanvas", (PyCFunction) _wrap_PrintPreview_GetCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_PaintPage", (PyCFunction) _wrap_PrintPreview_PaintPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_DrawBlankPage", (PyCFunction) _wrap_PrintPreview_DrawBlankPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_RenderPage", (PyCFunction) _wrap_PrintPreview_RenderPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_AdjustScrollbars", (PyCFunction) _wrap_PrintPreview_AdjustScrollbars, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetPrintDialogData", (PyCFunction) _wrap_PrintPreview_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_SetZoom", (PyCFunction) _wrap_PrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetZoom", (PyCFunction) _wrap_PrintPreview_GetZoom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetMaxPage", (PyCFunction) _wrap_PrintPreview_GetMaxPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_GetMinPage", (PyCFunction) _wrap_PrintPreview_GetMinPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_Ok", (PyCFunction) _wrap_PrintPreview_Ok, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_SetOk", (PyCFunction) _wrap_PrintPreview_SetOk, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_Print", (PyCFunction) _wrap_PrintPreview_Print, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_DetermineScaling", (PyCFunction) _wrap_PrintPreview_DetermineScaling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PrintPreview_swigregister", PrintPreview_swigregister, METH_VARARGS },
-        { (char *)"new_PyPrintPreview", _wrap_new_PyPrintPreview, METH_VARARGS },
-        { (char *)"PyPrintPreview__setCallbackInfo", (PyCFunction) _wrap_PyPrintPreview__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_base_SetCurrentPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_PaintPage", (PyCFunction) _wrap_PyPrintPreview_base_PaintPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_DrawBlankPage", (PyCFunction) _wrap_PyPrintPreview_base_DrawBlankPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_RenderPage", (PyCFunction) _wrap_PyPrintPreview_base_RenderPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_SetZoom", (PyCFunction) _wrap_PyPrintPreview_base_SetZoom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_Print", (PyCFunction) _wrap_PyPrintPreview_base_Print, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_base_DetermineScaling", (PyCFunction) _wrap_PyPrintPreview_base_DetermineScaling, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPrintPreview_swigregister", PyPrintPreview_swigregister, METH_VARARGS },
-        { (char *)"new_PyPreviewFrame", (PyCFunction) _wrap_new_PyPreviewFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame__setCallbackInfo", (PyCFunction) _wrap_PyPreviewFrame__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame_SetPreviewCanvas", (PyCFunction) _wrap_PyPreviewFrame_SetPreviewCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame_SetControlBar", (PyCFunction) _wrap_PyPreviewFrame_SetControlBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame_base_Initialize", (PyCFunction) _wrap_PyPreviewFrame_base_Initialize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame_base_CreateCanvas", (PyCFunction) _wrap_PyPreviewFrame_base_CreateCanvas, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame_base_CreateControlBar", (PyCFunction) _wrap_PyPreviewFrame_base_CreateControlBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewFrame_swigregister", PyPreviewFrame_swigregister, METH_VARARGS },
-        { (char *)"new_PyPreviewControlBar", (PyCFunction) _wrap_new_PyPreviewControlBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewControlBar__setCallbackInfo", (PyCFunction) _wrap_PyPreviewControlBar__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewControlBar_SetPrintPreview", (PyCFunction) _wrap_PyPreviewControlBar_SetPrintPreview, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewControlBar_base_CreateButtons", (PyCFunction) _wrap_PyPreviewControlBar_base_CreateButtons, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewControlBar_base_SetZoomControl", (PyCFunction) _wrap_PyPreviewControlBar_base_SetZoomControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyPreviewControlBar_swigregister", PyPreviewControlBar_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_Panel", (PyCFunction) _wrap_new_Panel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePanel", (PyCFunction) _wrap_new_PrePanel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Panel_Create", (PyCFunction) _wrap_Panel_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Panel_InitDialog", (PyCFunction) _wrap_Panel_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Panel_GetClassDefaultAttributes", (PyCFunction) _wrap_Panel_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Panel_swigregister", Panel_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ScrolledWindow", (PyCFunction) _wrap_new_ScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreScrolledWindow", (PyCFunction) _wrap_new_PreScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_Create", (PyCFunction) _wrap_ScrolledWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_SetScrollbars", (PyCFunction) _wrap_ScrolledWindow_SetScrollbars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_Scroll", (PyCFunction) _wrap_ScrolledWindow_Scroll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetScrollPageSize", (PyCFunction) _wrap_ScrolledWindow_GetScrollPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_SetScrollPageSize", (PyCFunction) _wrap_ScrolledWindow_SetScrollPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_SetScrollRate", (PyCFunction) _wrap_ScrolledWindow_SetScrollRate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetScrollPixelsPerUnit", (PyCFunction) _wrap_ScrolledWindow_GetScrollPixelsPerUnit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_EnableScrolling", (PyCFunction) _wrap_ScrolledWindow_EnableScrolling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetViewStart", (PyCFunction) _wrap_ScrolledWindow_GetViewStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_SetScale", (PyCFunction) _wrap_ScrolledWindow_SetScale, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetScaleX", (PyCFunction) _wrap_ScrolledWindow_GetScaleX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetScaleY", (PyCFunction) _wrap_ScrolledWindow_GetScaleY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_CalcScrolledPosition", _wrap_ScrolledWindow_CalcScrolledPosition, METH_VARARGS, NULL },
+        { (char *)"ScrolledWindow_CalcUnscrolledPosition", _wrap_ScrolledWindow_CalcUnscrolledPosition, METH_VARARGS, NULL },
+        { (char *)"ScrolledWindow_AdjustScrollbars", (PyCFunction) _wrap_ScrolledWindow_AdjustScrollbars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_CalcScrollInc", (PyCFunction) _wrap_ScrolledWindow_CalcScrollInc, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_SetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_SetTargetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetTargetWindow", (PyCFunction) _wrap_ScrolledWindow_GetTargetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_SetTargetRect", (PyCFunction) _wrap_ScrolledWindow_SetTargetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetTargetRect", (PyCFunction) _wrap_ScrolledWindow_GetTargetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_DoPrepareDC", (PyCFunction) _wrap_ScrolledWindow_DoPrepareDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_ScrolledWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ScrolledWindow_swigregister", ScrolledWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"TopLevelWindow_Maximize", (PyCFunction) _wrap_TopLevelWindow_Maximize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_Restore", (PyCFunction) _wrap_TopLevelWindow_Restore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_Iconize", (PyCFunction) _wrap_TopLevelWindow_Iconize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_IsMaximized", (PyCFunction) _wrap_TopLevelWindow_IsMaximized, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_IsIconized", (PyCFunction) _wrap_TopLevelWindow_IsIconized, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_GetIcon", (PyCFunction) _wrap_TopLevelWindow_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_SetIcon", (PyCFunction) _wrap_TopLevelWindow_SetIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_SetIcons", (PyCFunction) _wrap_TopLevelWindow_SetIcons, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_ShowFullScreen", (PyCFunction) _wrap_TopLevelWindow_ShowFullScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_IsFullScreen", (PyCFunction) _wrap_TopLevelWindow_IsFullScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_SetTitle", (PyCFunction) _wrap_TopLevelWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_GetTitle", (PyCFunction) _wrap_TopLevelWindow_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_SetShape", (PyCFunction) _wrap_TopLevelWindow_SetShape, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_RequestUserAttention", (PyCFunction) _wrap_TopLevelWindow_RequestUserAttention, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_MacSetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacSetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_MacGetMetalAppearance", (PyCFunction) _wrap_TopLevelWindow_MacGetMetalAppearance, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TopLevelWindow_swigregister", TopLevelWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Frame", (PyCFunction) _wrap_new_Frame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreFrame", (PyCFunction) _wrap_new_PreFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_Create", (PyCFunction) _wrap_Frame_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_GetClientAreaOrigin", (PyCFunction) _wrap_Frame_GetClientAreaOrigin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SendSizeEvent", (PyCFunction) _wrap_Frame_SendSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SetMenuBar", (PyCFunction) _wrap_Frame_SetMenuBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_GetMenuBar", (PyCFunction) _wrap_Frame_GetMenuBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_ProcessCommand", (PyCFunction) _wrap_Frame_ProcessCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_CreateStatusBar", (PyCFunction) _wrap_Frame_CreateStatusBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_GetStatusBar", (PyCFunction) _wrap_Frame_GetStatusBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SetStatusBar", (PyCFunction) _wrap_Frame_SetStatusBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SetStatusText", (PyCFunction) _wrap_Frame_SetStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SetStatusWidths", (PyCFunction) _wrap_Frame_SetStatusWidths, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_PushStatusText", (PyCFunction) _wrap_Frame_PushStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_PopStatusText", (PyCFunction) _wrap_Frame_PopStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SetStatusBarPane", (PyCFunction) _wrap_Frame_SetStatusBarPane, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_GetStatusBarPane", (PyCFunction) _wrap_Frame_GetStatusBarPane, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_CreateToolBar", (PyCFunction) _wrap_Frame_CreateToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_GetToolBar", (PyCFunction) _wrap_Frame_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_SetToolBar", (PyCFunction) _wrap_Frame_SetToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_DoGiveHelp", (PyCFunction) _wrap_Frame_DoGiveHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_DoMenuUpdates", (PyCFunction) _wrap_Frame_DoMenuUpdates, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_GetClassDefaultAttributes", (PyCFunction) _wrap_Frame_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Frame_swigregister", Frame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Dialog", (PyCFunction) _wrap_new_Dialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreDialog", (PyCFunction) _wrap_new_PreDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_Create", (PyCFunction) _wrap_Dialog_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_SetReturnCode", (PyCFunction) _wrap_Dialog_SetReturnCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_GetClassDefaultAttributes", (PyCFunction) _wrap_Dialog_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Dialog_swigregister", Dialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MiniFrame", (PyCFunction) _wrap_new_MiniFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreMiniFrame", (PyCFunction) _wrap_new_PreMiniFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MiniFrame_Create", (PyCFunction) _wrap_MiniFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MiniFrame_swigregister", MiniFrame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SplashScreenWindow", (PyCFunction) _wrap_new_SplashScreenWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreenWindow_SetBitmap", (PyCFunction) _wrap_SplashScreenWindow_SetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreenWindow_GetBitmap", (PyCFunction) _wrap_SplashScreenWindow_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreenWindow_swigregister", SplashScreenWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SplashScreen", (PyCFunction) _wrap_new_SplashScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreen_GetSplashStyle", (PyCFunction) _wrap_SplashScreen_GetSplashStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreen_GetSplashWindow", (PyCFunction) _wrap_SplashScreen_GetSplashWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreen_GetTimeout", (PyCFunction) _wrap_SplashScreen_GetTimeout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplashScreen_swigregister", SplashScreen_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_StatusBar", (PyCFunction) _wrap_new_StatusBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreStatusBar", (PyCFunction) _wrap_new_PreStatusBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_Create", (PyCFunction) _wrap_StatusBar_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_SetFieldsCount", (PyCFunction) _wrap_StatusBar_SetFieldsCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_GetFieldsCount", (PyCFunction) _wrap_StatusBar_GetFieldsCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_SetStatusText", (PyCFunction) _wrap_StatusBar_SetStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_GetStatusText", (PyCFunction) _wrap_StatusBar_GetStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_PushStatusText", (PyCFunction) _wrap_StatusBar_PushStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_PopStatusText", (PyCFunction) _wrap_StatusBar_PopStatusText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_SetStatusWidths", (PyCFunction) _wrap_StatusBar_SetStatusWidths, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_SetStatusStyles", (PyCFunction) _wrap_StatusBar_SetStatusStyles, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_GetFieldRect", (PyCFunction) _wrap_StatusBar_GetFieldRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_SetMinHeight", (PyCFunction) _wrap_StatusBar_SetMinHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_GetBorderX", (PyCFunction) _wrap_StatusBar_GetBorderX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_GetBorderY", (PyCFunction) _wrap_StatusBar_GetBorderY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_GetClassDefaultAttributes", (PyCFunction) _wrap_StatusBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"StatusBar_swigregister", StatusBar_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SplitterWindow", (PyCFunction) _wrap_new_SplitterWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSplitterWindow", (PyCFunction) _wrap_new_PreSplitterWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_Create", (PyCFunction) _wrap_SplitterWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetWindow1", (PyCFunction) _wrap_SplitterWindow_GetWindow1, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetWindow2", (PyCFunction) _wrap_SplitterWindow_GetWindow2, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SetSplitMode", (PyCFunction) _wrap_SplitterWindow_SetSplitMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetSplitMode", (PyCFunction) _wrap_SplitterWindow_GetSplitMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_Initialize", (PyCFunction) _wrap_SplitterWindow_Initialize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SplitVertically", (PyCFunction) _wrap_SplitterWindow_SplitVertically, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SplitHorizontally", (PyCFunction) _wrap_SplitterWindow_SplitHorizontally, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_Unsplit", (PyCFunction) _wrap_SplitterWindow_Unsplit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_ReplaceWindow", (PyCFunction) _wrap_SplitterWindow_ReplaceWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_UpdateSize", (PyCFunction) _wrap_SplitterWindow_UpdateSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_IsSplit", (PyCFunction) _wrap_SplitterWindow_IsSplit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SetSashSize", (PyCFunction) _wrap_SplitterWindow_SetSashSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SetBorderSize", (PyCFunction) _wrap_SplitterWindow_SetBorderSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetSashSize", (PyCFunction) _wrap_SplitterWindow_GetSashSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetBorderSize", (PyCFunction) _wrap_SplitterWindow_GetBorderSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SetSashPosition", (PyCFunction) _wrap_SplitterWindow_SetSashPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetSashPosition", (PyCFunction) _wrap_SplitterWindow_GetSashPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SetMinimumPaneSize", (PyCFunction) _wrap_SplitterWindow_SetMinimumPaneSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetMinimumPaneSize", (PyCFunction) _wrap_SplitterWindow_GetMinimumPaneSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SashHitTest", (PyCFunction) _wrap_SplitterWindow_SashHitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SizeWindows", (PyCFunction) _wrap_SplitterWindow_SizeWindows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_SetNeedUpdating", (PyCFunction) _wrap_SplitterWindow_SetNeedUpdating, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetNeedUpdating", (PyCFunction) _wrap_SplitterWindow_GetNeedUpdating, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_SplitterWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterWindow_swigregister", SplitterWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SplitterEvent", (PyCFunction) _wrap_new_SplitterEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterEvent_SetSashPosition", (PyCFunction) _wrap_SplitterEvent_SetSashPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterEvent_GetSashPosition", (PyCFunction) _wrap_SplitterEvent_GetSashPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterEvent_GetWindowBeingRemoved", (PyCFunction) _wrap_SplitterEvent_GetWindowBeingRemoved, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterEvent_GetX", (PyCFunction) _wrap_SplitterEvent_GetX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterEvent_GetY", (PyCFunction) _wrap_SplitterEvent_GetY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SplitterEvent_swigregister", SplitterEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SashWindow", (PyCFunction) _wrap_new_SashWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSashWindow", (PyCFunction) _wrap_new_PreSashWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_Create", (PyCFunction) _wrap_SashWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetSashVisible", (PyCFunction) _wrap_SashWindow_SetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetSashVisible", (PyCFunction) _wrap_SashWindow_GetSashVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetSashBorder", (PyCFunction) _wrap_SashWindow_SetSashBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_HasBorder", (PyCFunction) _wrap_SashWindow_HasBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetEdgeMargin", (PyCFunction) _wrap_SashWindow_GetEdgeMargin, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_SetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetDefaultBorderSize", (PyCFunction) _wrap_SashWindow_GetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetExtraBorderSize", (PyCFunction) _wrap_SashWindow_SetExtraBorderSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetExtraBorderSize", (PyCFunction) _wrap_SashWindow_GetExtraBorderSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetMinimumSizeX", (PyCFunction) _wrap_SashWindow_SetMinimumSizeX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetMinimumSizeY", (PyCFunction) _wrap_SashWindow_SetMinimumSizeY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetMinimumSizeX", (PyCFunction) _wrap_SashWindow_GetMinimumSizeX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetMinimumSizeY", (PyCFunction) _wrap_SashWindow_GetMinimumSizeY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetMaximumSizeX", (PyCFunction) _wrap_SashWindow_SetMaximumSizeX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SetMaximumSizeY", (PyCFunction) _wrap_SashWindow_SetMaximumSizeY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetMaximumSizeX", (PyCFunction) _wrap_SashWindow_GetMaximumSizeX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_GetMaximumSizeY", (PyCFunction) _wrap_SashWindow_GetMaximumSizeY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SashHitTest", (PyCFunction) _wrap_SashWindow_SashHitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_SizeWindows", (PyCFunction) _wrap_SashWindow_SizeWindows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashWindow_swigregister", SashWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SashEvent", (PyCFunction) _wrap_new_SashEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_SetEdge", (PyCFunction) _wrap_SashEvent_SetEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_GetEdge", (PyCFunction) _wrap_SashEvent_GetEdge, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_SetDragRect", (PyCFunction) _wrap_SashEvent_SetDragRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_GetDragRect", (PyCFunction) _wrap_SashEvent_GetDragRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_SetDragStatus", (PyCFunction) _wrap_SashEvent_SetDragStatus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_GetDragStatus", (PyCFunction) _wrap_SashEvent_GetDragStatus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashEvent_swigregister", SashEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_QueryLayoutInfoEvent", (PyCFunction) _wrap_new_QueryLayoutInfoEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_SetRequestedLength", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetRequestedLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_GetRequestedLength", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetRequestedLength, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_SetFlags", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_GetFlags", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_SetSize", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_GetSize", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_SetOrientation", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_GetOrientation", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_SetAlignment", (PyCFunction) _wrap_QueryLayoutInfoEvent_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_GetAlignment", (PyCFunction) _wrap_QueryLayoutInfoEvent_GetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"QueryLayoutInfoEvent_swigregister", QueryLayoutInfoEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CalculateLayoutEvent", (PyCFunction) _wrap_new_CalculateLayoutEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalculateLayoutEvent_SetFlags", (PyCFunction) _wrap_CalculateLayoutEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalculateLayoutEvent_GetFlags", (PyCFunction) _wrap_CalculateLayoutEvent_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalculateLayoutEvent_SetRect", (PyCFunction) _wrap_CalculateLayoutEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalculateLayoutEvent_GetRect", (PyCFunction) _wrap_CalculateLayoutEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalculateLayoutEvent_swigregister", CalculateLayoutEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SashLayoutWindow", (PyCFunction) _wrap_new_SashLayoutWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreSashLayoutWindow", (PyCFunction) _wrap_new_PreSashLayoutWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_Create", (PyCFunction) _wrap_SashLayoutWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_GetAlignment", (PyCFunction) _wrap_SashLayoutWindow_GetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_GetOrientation", (PyCFunction) _wrap_SashLayoutWindow_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_SetAlignment", (PyCFunction) _wrap_SashLayoutWindow_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_SetDefaultSize", (PyCFunction) _wrap_SashLayoutWindow_SetDefaultSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_SetOrientation", (PyCFunction) _wrap_SashLayoutWindow_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SashLayoutWindow_swigregister", SashLayoutWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_LayoutAlgorithm", (PyCFunction) _wrap_new_LayoutAlgorithm, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_LayoutAlgorithm", (PyCFunction) _wrap_delete_LayoutAlgorithm, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutAlgorithm_LayoutMDIFrame", (PyCFunction) _wrap_LayoutAlgorithm_LayoutMDIFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutAlgorithm_LayoutFrame", (PyCFunction) _wrap_LayoutAlgorithm_LayoutFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutAlgorithm_LayoutWindow", (PyCFunction) _wrap_LayoutAlgorithm_LayoutWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"LayoutAlgorithm_swigregister", LayoutAlgorithm_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PopupWindow", (PyCFunction) _wrap_new_PopupWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePopupWindow", (PyCFunction) _wrap_new_PrePopupWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PopupWindow_swigregister", PopupWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PopupTransientWindow", (PyCFunction) _wrap_new_PopupTransientWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePopupTransientWindow", (PyCFunction) _wrap_new_PrePopupTransientWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PopupTransientWindow_swigregister", PopupTransientWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TipWindow", (PyCFunction) _wrap_new_TipWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipWindow_SetBoundingRect", (PyCFunction) _wrap_TipWindow_SetBoundingRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipWindow_Close", (PyCFunction) _wrap_TipWindow_Close, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TipWindow_swigregister", TipWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_VScrolledWindow", (PyCFunction) _wrap_new_VScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreVScrolledWindow", (PyCFunction) _wrap_new_PreVScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_VScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_Create", (PyCFunction) _wrap_VScrolledWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_SetLineCount", (PyCFunction) _wrap_VScrolledWindow_SetLineCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_ScrollToLine", (PyCFunction) _wrap_VScrolledWindow_ScrollToLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_ScrollLines", (PyCFunction) _wrap_VScrolledWindow_ScrollLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_ScrollPages", (PyCFunction) _wrap_VScrolledWindow_ScrollPages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_RefreshLine", (PyCFunction) _wrap_VScrolledWindow_RefreshLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_RefreshLines", (PyCFunction) _wrap_VScrolledWindow_RefreshLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_HitTestXY", (PyCFunction) _wrap_VScrolledWindow_HitTestXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_HitTest", (PyCFunction) _wrap_VScrolledWindow_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_RefreshAll", (PyCFunction) _wrap_VScrolledWindow_RefreshAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_GetLineCount", (PyCFunction) _wrap_VScrolledWindow_GetLineCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_GetFirstVisibleLine", (PyCFunction) _wrap_VScrolledWindow_GetFirstVisibleLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_GetLastVisibleLine", (PyCFunction) _wrap_VScrolledWindow_GetLastVisibleLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_IsVisible", (PyCFunction) _wrap_VScrolledWindow_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VScrolledWindow_swigregister", VScrolledWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_VListBox", (PyCFunction) _wrap_new_VListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreVListBox", (PyCFunction) _wrap_new_PreVListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox__setCallbackInfo", (PyCFunction) _wrap_VListBox__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_Create", (PyCFunction) _wrap_VListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetItemCount", (PyCFunction) _wrap_VListBox_GetItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_HasMultipleSelection", (PyCFunction) _wrap_VListBox_HasMultipleSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetSelection", (PyCFunction) _wrap_VListBox_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_IsCurrent", (PyCFunction) _wrap_VListBox_IsCurrent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_IsSelected", (PyCFunction) _wrap_VListBox_IsSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetSelectedCount", (PyCFunction) _wrap_VListBox_GetSelectedCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetFirstSelected", (PyCFunction) _wrap_VListBox_GetFirstSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetNextSelected", (PyCFunction) _wrap_VListBox_GetNextSelected, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetMargins", (PyCFunction) _wrap_VListBox_GetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_GetSelectionBackground", (PyCFunction) _wrap_VListBox_GetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SetItemCount", (PyCFunction) _wrap_VListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_Clear", (PyCFunction) _wrap_VListBox_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SetSelection", (PyCFunction) _wrap_VListBox_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_Select", (PyCFunction) _wrap_VListBox_Select, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SelectRange", (PyCFunction) _wrap_VListBox_SelectRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_Toggle", (PyCFunction) _wrap_VListBox_Toggle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SelectAll", (PyCFunction) _wrap_VListBox_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_DeselectAll", (PyCFunction) _wrap_VListBox_DeselectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SetMargins", (PyCFunction) _wrap_VListBox_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SetMarginsXY", (PyCFunction) _wrap_VListBox_SetMarginsXY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_SetSelectionBackground", (PyCFunction) _wrap_VListBox_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"VListBox_swigregister", VListBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlListBox", (PyCFunction) _wrap_new_HtmlListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreHtmlListBox", (PyCFunction) _wrap_new_PreHtmlListBox, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlListBox__setCallbackInfo", (PyCFunction) _wrap_HtmlListBox__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlListBox_RefreshAll", (PyCFunction) _wrap_HtmlListBox_RefreshAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlListBox_GetFileSystem", (PyCFunction) _wrap_HtmlListBox_GetFileSystem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TaskBarIcon", (PyCFunction) _wrap_new_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_TaskBarIcon", (PyCFunction) _wrap_delete_TaskBarIcon, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TaskBarIcon_Destroy", (PyCFunction) _wrap_TaskBarIcon_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TaskBarIcon_swigregister", TaskBarIcon_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TaskBarIconEvent", (PyCFunction) _wrap_new_TaskBarIconEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TaskBarIconEvent_swigregister", TaskBarIconEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ColourData", (PyCFunction) _wrap_new_ColourData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_ColourData", (PyCFunction) _wrap_delete_ColourData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_GetChooseFull", (PyCFunction) _wrap_ColourData_GetChooseFull, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_GetColour", (PyCFunction) _wrap_ColourData_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_GetCustomColour", (PyCFunction) _wrap_ColourData_GetCustomColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_SetChooseFull", (PyCFunction) _wrap_ColourData_SetChooseFull, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_SetColour", (PyCFunction) _wrap_ColourData_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_SetCustomColour", (PyCFunction) _wrap_ColourData_SetCustomColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourData_swigregister", ColourData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ColourDialog", (PyCFunction) _wrap_new_ColourDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDialog_GetColourData", (PyCFunction) _wrap_ColourDialog_GetColourData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ColourDialog_swigregister", ColourDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_DirDialog", (PyCFunction) _wrap_new_DirDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirDialog_GetPath", (PyCFunction) _wrap_DirDialog_GetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirDialog_GetMessage", (PyCFunction) _wrap_DirDialog_GetMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirDialog_GetStyle", (PyCFunction) _wrap_DirDialog_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirDialog_SetMessage", (PyCFunction) _wrap_DirDialog_SetMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirDialog_SetPath", (PyCFunction) _wrap_DirDialog_SetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DirDialog_swigregister", DirDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FileDialog", (PyCFunction) _wrap_new_FileDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetMessage", (PyCFunction) _wrap_FileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetPath", (PyCFunction) _wrap_FileDialog_SetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetDirectory", (PyCFunction) _wrap_FileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetFilename", (PyCFunction) _wrap_FileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetWildcard", (PyCFunction) _wrap_FileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetStyle", (PyCFunction) _wrap_FileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_SetFilterIndex", (PyCFunction) _wrap_FileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetMessage", (PyCFunction) _wrap_FileDialog_GetMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetPath", (PyCFunction) _wrap_FileDialog_GetPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetDirectory", (PyCFunction) _wrap_FileDialog_GetDirectory, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetFilename", (PyCFunction) _wrap_FileDialog_GetFilename, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetWildcard", (PyCFunction) _wrap_FileDialog_GetWildcard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetStyle", (PyCFunction) _wrap_FileDialog_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetFilterIndex", (PyCFunction) _wrap_FileDialog_GetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetFilenames", (PyCFunction) _wrap_FileDialog_GetFilenames, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_GetPaths", (PyCFunction) _wrap_FileDialog_GetPaths, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FileDialog_swigregister", FileDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MultiChoiceDialog", (PyCFunction) _wrap_new_MultiChoiceDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MultiChoiceDialog_SetSelections", (PyCFunction) _wrap_MultiChoiceDialog_SetSelections, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MultiChoiceDialog_GetSelections", (PyCFunction) _wrap_MultiChoiceDialog_GetSelections, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MultiChoiceDialog_swigregister", MultiChoiceDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_SingleChoiceDialog", (PyCFunction) _wrap_new_SingleChoiceDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleChoiceDialog_GetSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleChoiceDialog_SetSelection", (PyCFunction) _wrap_SingleChoiceDialog_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"SingleChoiceDialog_swigregister", SingleChoiceDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_TextEntryDialog", (PyCFunction) _wrap_new_TextEntryDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextEntryDialog_GetValue", (PyCFunction) _wrap_TextEntryDialog_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextEntryDialog_SetValue", (PyCFunction) _wrap_TextEntryDialog_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"TextEntryDialog_swigregister", TextEntryDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FontData", (PyCFunction) _wrap_new_FontData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FontData", (PyCFunction) _wrap_delete_FontData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_EnableEffects", (PyCFunction) _wrap_FontData_EnableEffects, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_GetAllowSymbols", (PyCFunction) _wrap_FontData_GetAllowSymbols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_GetColour", (PyCFunction) _wrap_FontData_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_GetChosenFont", (PyCFunction) _wrap_FontData_GetChosenFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_GetEnableEffects", (PyCFunction) _wrap_FontData_GetEnableEffects, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_GetInitialFont", (PyCFunction) _wrap_FontData_GetInitialFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_GetShowHelp", (PyCFunction) _wrap_FontData_GetShowHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_SetAllowSymbols", (PyCFunction) _wrap_FontData_SetAllowSymbols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_SetChosenFont", (PyCFunction) _wrap_FontData_SetChosenFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_SetColour", (PyCFunction) _wrap_FontData_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_SetInitialFont", (PyCFunction) _wrap_FontData_SetInitialFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_SetRange", (PyCFunction) _wrap_FontData_SetRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_SetShowHelp", (PyCFunction) _wrap_FontData_SetShowHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontData_swigregister", FontData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FontDialog", (PyCFunction) _wrap_new_FontDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontDialog_GetFontData", (PyCFunction) _wrap_FontDialog_GetFontData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FontDialog_swigregister", FontDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MessageDialog", (PyCFunction) _wrap_new_MessageDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MessageDialog_swigregister", MessageDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProgressDialog_Resume", (PyCFunction) _wrap_ProgressDialog_Resume, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"ProgressDialog_swigregister", ProgressDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FindDialogEvent", (PyCFunction) _wrap_new_FindDialogEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_GetFlags", (PyCFunction) _wrap_FindDialogEvent_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_GetFindString", (PyCFunction) _wrap_FindDialogEvent_GetFindString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_GetReplaceString", (PyCFunction) _wrap_FindDialogEvent_GetReplaceString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_GetDialog", (PyCFunction) _wrap_FindDialogEvent_GetDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_SetFlags", (PyCFunction) _wrap_FindDialogEvent_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_SetFindString", (PyCFunction) _wrap_FindDialogEvent_SetFindString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_SetReplaceString", (PyCFunction) _wrap_FindDialogEvent_SetReplaceString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindDialogEvent_swigregister", FindDialogEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FindReplaceData", (PyCFunction) _wrap_new_FindReplaceData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_FindReplaceData", (PyCFunction) _wrap_delete_FindReplaceData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_GetFindString", (PyCFunction) _wrap_FindReplaceData_GetFindString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_GetReplaceString", (PyCFunction) _wrap_FindReplaceData_GetReplaceString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_GetFlags", (PyCFunction) _wrap_FindReplaceData_GetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_SetFlags", (PyCFunction) _wrap_FindReplaceData_SetFlags, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_SetFindString", (PyCFunction) _wrap_FindReplaceData_SetFindString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_SetReplaceString", (PyCFunction) _wrap_FindReplaceData_SetReplaceString, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceData_swigregister", FindReplaceData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_FindReplaceDialog", (PyCFunction) _wrap_new_FindReplaceDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreFindReplaceDialog", (PyCFunction) _wrap_new_PreFindReplaceDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceDialog_Create", (PyCFunction) _wrap_FindReplaceDialog_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceDialog_GetData", (PyCFunction) _wrap_FindReplaceDialog_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceDialog_SetData", (PyCFunction) _wrap_FindReplaceDialog_SetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"FindReplaceDialog_swigregister", FindReplaceDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MDIParentFrame", (PyCFunction) _wrap_new_MDIParentFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreMDIParentFrame", (PyCFunction) _wrap_new_PreMDIParentFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_Create", (PyCFunction) _wrap_MDIParentFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_ActivateNext", (PyCFunction) _wrap_MDIParentFrame_ActivateNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_ActivatePrevious", (PyCFunction) _wrap_MDIParentFrame_ActivatePrevious, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_ArrangeIcons", (PyCFunction) _wrap_MDIParentFrame_ArrangeIcons, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_Cascade", (PyCFunction) _wrap_MDIParentFrame_Cascade, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_GetActiveChild", (PyCFunction) _wrap_MDIParentFrame_GetActiveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_GetClientWindow", (PyCFunction) _wrap_MDIParentFrame_GetClientWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_GetToolBar", (PyCFunction) _wrap_MDIParentFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_Tile", (PyCFunction) _wrap_MDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIParentFrame_swigregister", MDIParentFrame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MDIChildFrame", (PyCFunction) _wrap_new_MDIChildFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreMDIChildFrame", (PyCFunction) _wrap_new_PreMDIChildFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIChildFrame_Create", (PyCFunction) _wrap_MDIChildFrame_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIChildFrame_Activate", (PyCFunction) _wrap_MDIChildFrame_Activate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIChildFrame_Maximize", (PyCFunction) _wrap_MDIChildFrame_Maximize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIChildFrame_Restore", (PyCFunction) _wrap_MDIChildFrame_Restore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIChildFrame_swigregister", MDIChildFrame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_MDIClientWindow", (PyCFunction) _wrap_new_MDIClientWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreMDIClientWindow", (PyCFunction) _wrap_new_PreMDIClientWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIClientWindow_Create", (PyCFunction) _wrap_MDIClientWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"MDIClientWindow_swigregister", MDIClientWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyWindow", (PyCFunction) _wrap_new_PyWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePyWindow", (PyCFunction) _wrap_new_PrePyWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow__setCallbackInfo", (PyCFunction) _wrap_PyWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_SetBestSize", (PyCFunction) _wrap_PyWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoSetSize", (PyCFunction) _wrap_PyWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoGetSize", (PyCFunction) _wrap_PyWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoGetPosition", (PyCFunction) _wrap_PyWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_InitDialog", (PyCFunction) _wrap_PyWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_Validate", (PyCFunction) _wrap_PyWindow_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_GetMaxSize", (PyCFunction) _wrap_PyWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_AddChild", (PyCFunction) _wrap_PyWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_RemoveChild", (PyCFunction) _wrap_PyWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyWindow_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWindow_swigregister", PyWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyPanel", (PyCFunction) _wrap_new_PyPanel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePyPanel", (PyCFunction) _wrap_new_PrePyPanel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel__setCallbackInfo", (PyCFunction) _wrap_PyPanel__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_SetBestSize", (PyCFunction) _wrap_PyPanel_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoMoveWindow", (PyCFunction) _wrap_PyPanel_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoSetSize", (PyCFunction) _wrap_PyPanel_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoSetClientSize", (PyCFunction) _wrap_PyPanel_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoSetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoGetSize", (PyCFunction) _wrap_PyPanel_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoGetClientSize", (PyCFunction) _wrap_PyPanel_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoGetPosition", (PyCFunction) _wrap_PyPanel_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoGetVirtualSize", (PyCFunction) _wrap_PyPanel_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_DoGetBestSize", (PyCFunction) _wrap_PyPanel_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_InitDialog", (PyCFunction) _wrap_PyPanel_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_TransferDataToWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_TransferDataFromWindow", (PyCFunction) _wrap_PyPanel_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_Validate", (PyCFunction) _wrap_PyPanel_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_AcceptsFocus", (PyCFunction) _wrap_PyPanel_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyPanel_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_GetMaxSize", (PyCFunction) _wrap_PyPanel_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_AddChild", (PyCFunction) _wrap_PyPanel_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_RemoveChild", (PyCFunction) _wrap_PyPanel_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_ShouldInheritColours", (PyCFunction) _wrap_PyPanel_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyPanel_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_base_GetDefaultAttributes", (PyCFunction) _wrap_PyPanel_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPanel_swigregister", PyPanel_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyScrolledWindow", (PyCFunction) _wrap_new_PyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePyScrolledWindow", (PyCFunction) _wrap_new_PrePyScrolledWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow__setCallbackInfo", (PyCFunction) _wrap_PyScrolledWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_SetBestSize", (PyCFunction) _wrap_PyScrolledWindow_SetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoMoveWindow", (PyCFunction) _wrap_PyScrolledWindow_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoSetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoSetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoSetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoGetSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoGetClientSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoGetPosition", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoGetVirtualSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_DoGetBestSize", (PyCFunction) _wrap_PyScrolledWindow_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_InitDialog", (PyCFunction) _wrap_PyScrolledWindow_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_TransferDataToWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_TransferDataFromWindow", (PyCFunction) _wrap_PyScrolledWindow_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_Validate", (PyCFunction) _wrap_PyScrolledWindow_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_AcceptsFocus", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyScrolledWindow_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_GetMaxSize", (PyCFunction) _wrap_PyScrolledWindow_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_AddChild", (PyCFunction) _wrap_PyScrolledWindow_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_RemoveChild", (PyCFunction) _wrap_PyScrolledWindow_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_ShouldInheritColours", (PyCFunction) _wrap_PyScrolledWindow_base_ShouldInheritColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_ApplyParentThemeBackground", (PyCFunction) _wrap_PyScrolledWindow_base_ApplyParentThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_base_GetDefaultAttributes", (PyCFunction) _wrap_PyScrolledWindow_base_GetDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyScrolledWindow_swigregister", PyScrolledWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PrintData", _wrap_new_PrintData, METH_VARARGS, NULL },
+        { (char *)"delete_PrintData", (PyCFunction) _wrap_delete_PrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetNoCopies", (PyCFunction) _wrap_PrintData_GetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetCollate", (PyCFunction) _wrap_PrintData_GetCollate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetOrientation", (PyCFunction) _wrap_PrintData_GetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_Ok", (PyCFunction) _wrap_PrintData_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterName", (PyCFunction) _wrap_PrintData_GetPrinterName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetColour", (PyCFunction) _wrap_PrintData_GetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetDuplex", (PyCFunction) _wrap_PrintData_GetDuplex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPaperId", (PyCFunction) _wrap_PrintData_GetPaperId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPaperSize", (PyCFunction) _wrap_PrintData_GetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetQuality", (PyCFunction) _wrap_PrintData_GetQuality, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetNoCopies", (PyCFunction) _wrap_PrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetCollate", (PyCFunction) _wrap_PrintData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetOrientation", (PyCFunction) _wrap_PrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterName", (PyCFunction) _wrap_PrintData_SetPrinterName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetColour", (PyCFunction) _wrap_PrintData_SetColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetDuplex", (PyCFunction) _wrap_PrintData_SetDuplex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPaperId", (PyCFunction) _wrap_PrintData_SetPaperId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPaperSize", (PyCFunction) _wrap_PrintData_SetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetQuality", (PyCFunction) _wrap_PrintData_SetQuality, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterCommand", (PyCFunction) _wrap_PrintData_GetPrinterCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterOptions", (PyCFunction) _wrap_PrintData_GetPrinterOptions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPreviewCommand", (PyCFunction) _wrap_PrintData_GetPreviewCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetFilename", (PyCFunction) _wrap_PrintData_GetFilename, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetFontMetricPath", (PyCFunction) _wrap_PrintData_GetFontMetricPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterScaleX", (PyCFunction) _wrap_PrintData_GetPrinterScaleX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterScaleY", (PyCFunction) _wrap_PrintData_GetPrinterScaleY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterTranslateX", (PyCFunction) _wrap_PrintData_GetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrinterTranslateY", (PyCFunction) _wrap_PrintData_GetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetPrintMode", (PyCFunction) _wrap_PrintData_GetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterCommand", (PyCFunction) _wrap_PrintData_SetPrinterCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterOptions", (PyCFunction) _wrap_PrintData_SetPrinterOptions, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPreviewCommand", (PyCFunction) _wrap_PrintData_SetPreviewCommand, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetFilename", (PyCFunction) _wrap_PrintData_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetFontMetricPath", (PyCFunction) _wrap_PrintData_SetFontMetricPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterScaleX", (PyCFunction) _wrap_PrintData_SetPrinterScaleX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterScaleY", (PyCFunction) _wrap_PrintData_SetPrinterScaleY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterScaling", (PyCFunction) _wrap_PrintData_SetPrinterScaling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterTranslateX", (PyCFunction) _wrap_PrintData_SetPrinterTranslateX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterTranslateY", (PyCFunction) _wrap_PrintData_SetPrinterTranslateY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrinterTranslation", (PyCFunction) _wrap_PrintData_SetPrinterTranslation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetPrintMode", (PyCFunction) _wrap_PrintData_SetPrintMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_GetOutputStream", (PyCFunction) _wrap_PrintData_GetOutputStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_SetOutputStream", (PyCFunction) _wrap_PrintData_SetOutputStream, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintData_swigregister", PrintData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PageSetupDialogData", _wrap_new_PageSetupDialogData, METH_VARARGS, NULL },
+        { (char *)"delete_PageSetupDialogData", (PyCFunction) _wrap_delete_PageSetupDialogData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_EnableHelp", (PyCFunction) _wrap_PageSetupDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_EnableMargins", (PyCFunction) _wrap_PageSetupDialogData_EnableMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_EnableOrientation", (PyCFunction) _wrap_PageSetupDialogData_EnableOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_EnablePaper", (PyCFunction) _wrap_PageSetupDialogData_EnablePaper, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_EnablePrinter", (PyCFunction) _wrap_PageSetupDialogData_EnablePrinter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetDefaultMinMargins", (PyCFunction) _wrap_PageSetupDialogData_GetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetEnableMargins", (PyCFunction) _wrap_PageSetupDialogData_GetEnableMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetEnableOrientation", (PyCFunction) _wrap_PageSetupDialogData_GetEnableOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetEnablePaper", (PyCFunction) _wrap_PageSetupDialogData_GetEnablePaper, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetEnablePrinter", (PyCFunction) _wrap_PageSetupDialogData_GetEnablePrinter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetEnableHelp", (PyCFunction) _wrap_PageSetupDialogData_GetEnableHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetDefaultInfo", (PyCFunction) _wrap_PageSetupDialogData_GetDefaultInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_GetMarginTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_GetMarginBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetMinMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_GetMinMarginTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetMinMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_GetMinMarginBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetPaperId", (PyCFunction) _wrap_PageSetupDialogData_GetPaperId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetPaperSize", (PyCFunction) _wrap_PageSetupDialogData_GetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_GetPrintData", (PyCFunction) _wrap_PageSetupDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_Ok", (PyCFunction) _wrap_PageSetupDialogData_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetDefaultInfo", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetDefaultMinMargins", (PyCFunction) _wrap_PageSetupDialogData_SetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_SetMarginTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_SetMarginBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetMinMarginTopLeft", (PyCFunction) _wrap_PageSetupDialogData_SetMinMarginTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetMinMarginBottomRight", (PyCFunction) _wrap_PageSetupDialogData_SetMinMarginBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetPaperId", (PyCFunction) _wrap_PageSetupDialogData_SetPaperId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetPaperSize", (PyCFunction) _wrap_PageSetupDialogData_SetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_SetPrintData", (PyCFunction) _wrap_PageSetupDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialogData_swigregister", PageSetupDialogData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PageSetupDialog", (PyCFunction) _wrap_new_PageSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialog_GetPageSetupData", (PyCFunction) _wrap_PageSetupDialog_GetPageSetupData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialog_ShowModal", (PyCFunction) _wrap_PageSetupDialog_ShowModal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PageSetupDialog_swigregister", PageSetupDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PrintDialogData", _wrap_new_PrintDialogData, METH_VARARGS, NULL },
+        { (char *)"delete_PrintDialogData", (PyCFunction) _wrap_delete_PrintDialogData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetFromPage", (PyCFunction) _wrap_PrintDialogData_GetFromPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetToPage", (PyCFunction) _wrap_PrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetMinPage", (PyCFunction) _wrap_PrintDialogData_GetMinPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetMaxPage", (PyCFunction) _wrap_PrintDialogData_GetMaxPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetNoCopies", (PyCFunction) _wrap_PrintDialogData_GetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetAllPages", (PyCFunction) _wrap_PrintDialogData_GetAllPages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetSelection", (PyCFunction) _wrap_PrintDialogData_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetCollate", (PyCFunction) _wrap_PrintDialogData_GetCollate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetPrintToFile", (PyCFunction) _wrap_PrintDialogData_GetPrintToFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetSetupDialog", (PyCFunction) _wrap_PrintDialogData_GetSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetFromPage", (PyCFunction) _wrap_PrintDialogData_SetFromPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetToPage", (PyCFunction) _wrap_PrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetMinPage", (PyCFunction) _wrap_PrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetMaxPage", (PyCFunction) _wrap_PrintDialogData_SetMaxPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetNoCopies", (PyCFunction) _wrap_PrintDialogData_SetNoCopies, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetAllPages", (PyCFunction) _wrap_PrintDialogData_SetAllPages, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetSelection", (PyCFunction) _wrap_PrintDialogData_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetCollate", (PyCFunction) _wrap_PrintDialogData_SetCollate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetPrintToFile", (PyCFunction) _wrap_PrintDialogData_SetPrintToFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetSetupDialog", (PyCFunction) _wrap_PrintDialogData_SetSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_EnablePrintToFile", (PyCFunction) _wrap_PrintDialogData_EnablePrintToFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_EnableSelection", (PyCFunction) _wrap_PrintDialogData_EnableSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_EnablePageNumbers", (PyCFunction) _wrap_PrintDialogData_EnablePageNumbers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_EnableHelp", (PyCFunction) _wrap_PrintDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetEnablePrintToFile", (PyCFunction) _wrap_PrintDialogData_GetEnablePrintToFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetEnableSelection", (PyCFunction) _wrap_PrintDialogData_GetEnableSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetEnablePageNumbers", (PyCFunction) _wrap_PrintDialogData_GetEnablePageNumbers, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetEnableHelp", (PyCFunction) _wrap_PrintDialogData_GetEnableHelp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_Ok", (PyCFunction) _wrap_PrintDialogData_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_GetPrintData", (PyCFunction) _wrap_PrintDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_SetPrintData", (PyCFunction) _wrap_PrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialogData_swigregister", PrintDialogData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PrintDialog", (PyCFunction) _wrap_new_PrintDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialog_GetPrintDialogData", (PyCFunction) _wrap_PrintDialog_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialog_GetPrintDC", (PyCFunction) _wrap_PrintDialog_GetPrintDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialog_ShowModal", (PyCFunction) _wrap_PrintDialog_ShowModal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintDialog_swigregister", PrintDialog_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Printer", (PyCFunction) _wrap_new_Printer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_Printer", (PyCFunction) _wrap_delete_Printer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_CreateAbortWindow", (PyCFunction) _wrap_Printer_CreateAbortWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_GetPrintDialogData", (PyCFunction) _wrap_Printer_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_Print", (PyCFunction) _wrap_Printer_Print, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_PrintDialog", (PyCFunction) _wrap_Printer_PrintDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_ReportError", (PyCFunction) _wrap_Printer_ReportError, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_Setup", (PyCFunction) _wrap_Printer_Setup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_GetAbort", (PyCFunction) _wrap_Printer_GetAbort, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_GetLastError", (PyCFunction) _wrap_Printer_GetLastError, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printer_swigregister", Printer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Printout", (PyCFunction) _wrap_new_Printout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout__setCallbackInfo", (PyCFunction) _wrap_Printout__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_GetTitle", (PyCFunction) _wrap_Printout_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_GetDC", (PyCFunction) _wrap_Printout_GetDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_SetDC", (PyCFunction) _wrap_Printout_SetDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_SetPageSizePixels", (PyCFunction) _wrap_Printout_SetPageSizePixels, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_GetPageSizePixels", (PyCFunction) _wrap_Printout_GetPageSizePixels, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_SetPageSizeMM", (PyCFunction) _wrap_Printout_SetPageSizeMM, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_GetPageSizeMM", (PyCFunction) _wrap_Printout_GetPageSizeMM, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_SetPPIScreen", (PyCFunction) _wrap_Printout_SetPPIScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_GetPPIScreen", (PyCFunction) _wrap_Printout_GetPPIScreen, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_SetPPIPrinter", (PyCFunction) _wrap_Printout_SetPPIPrinter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_GetPPIPrinter", (PyCFunction) _wrap_Printout_GetPPIPrinter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_IsPreview", (PyCFunction) _wrap_Printout_IsPreview, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_SetIsPreview", (PyCFunction) _wrap_Printout_SetIsPreview, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_OnBeginDocument", (PyCFunction) _wrap_Printout_base_OnBeginDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_OnEndDocument", (PyCFunction) _wrap_Printout_base_OnEndDocument, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_OnBeginPrinting", (PyCFunction) _wrap_Printout_base_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_OnEndPrinting", (PyCFunction) _wrap_Printout_base_OnEndPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_OnPreparePrinting", (PyCFunction) _wrap_Printout_base_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_HasPage", (PyCFunction) _wrap_Printout_base_HasPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_base_GetPageInfo", (PyCFunction) _wrap_Printout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Printout_swigregister", Printout_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PreviewCanvas", (PyCFunction) _wrap_new_PreviewCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewCanvas_swigregister", PreviewCanvas_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PreviewFrame", (PyCFunction) _wrap_new_PreviewFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewFrame_Initialize", (PyCFunction) _wrap_PreviewFrame_Initialize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewFrame_CreateControlBar", (PyCFunction) _wrap_PreviewFrame_CreateControlBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewFrame_CreateCanvas", (PyCFunction) _wrap_PreviewFrame_CreateCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewFrame_GetControlBar", (PyCFunction) _wrap_PreviewFrame_GetControlBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewFrame_swigregister", PreviewFrame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PreviewControlBar", (PyCFunction) _wrap_new_PreviewControlBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_GetZoomControl", (PyCFunction) _wrap_PreviewControlBar_GetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_SetZoomControl", (PyCFunction) _wrap_PreviewControlBar_SetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_GetPrintPreview", (PyCFunction) _wrap_PreviewControlBar_GetPrintPreview, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_OnNext", (PyCFunction) _wrap_PreviewControlBar_OnNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_OnPrevious", (PyCFunction) _wrap_PreviewControlBar_OnPrevious, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_OnFirst", (PyCFunction) _wrap_PreviewControlBar_OnFirst, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_OnLast", (PyCFunction) _wrap_PreviewControlBar_OnLast, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_OnGoto", (PyCFunction) _wrap_PreviewControlBar_OnGoto, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PreviewControlBar_swigregister", PreviewControlBar_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PrintPreview", _wrap_new_PrintPreview, METH_VARARGS, NULL },
+        { (char *)"PrintPreview_SetCurrentPage", (PyCFunction) _wrap_PrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetCurrentPage", (PyCFunction) _wrap_PrintPreview_GetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_SetPrintout", (PyCFunction) _wrap_PrintPreview_SetPrintout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetPrintout", (PyCFunction) _wrap_PrintPreview_GetPrintout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetPrintoutForPrinting", (PyCFunction) _wrap_PrintPreview_GetPrintoutForPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_SetFrame", (PyCFunction) _wrap_PrintPreview_SetFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_SetCanvas", (PyCFunction) _wrap_PrintPreview_SetCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetFrame", (PyCFunction) _wrap_PrintPreview_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetCanvas", (PyCFunction) _wrap_PrintPreview_GetCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_PaintPage", (PyCFunction) _wrap_PrintPreview_PaintPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_DrawBlankPage", (PyCFunction) _wrap_PrintPreview_DrawBlankPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_RenderPage", (PyCFunction) _wrap_PrintPreview_RenderPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_AdjustScrollbars", (PyCFunction) _wrap_PrintPreview_AdjustScrollbars, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetPrintDialogData", (PyCFunction) _wrap_PrintPreview_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_SetZoom", (PyCFunction) _wrap_PrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetZoom", (PyCFunction) _wrap_PrintPreview_GetZoom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetMaxPage", (PyCFunction) _wrap_PrintPreview_GetMaxPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_GetMinPage", (PyCFunction) _wrap_PrintPreview_GetMinPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_Ok", (PyCFunction) _wrap_PrintPreview_Ok, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_SetOk", (PyCFunction) _wrap_PrintPreview_SetOk, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_Print", (PyCFunction) _wrap_PrintPreview_Print, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_DetermineScaling", (PyCFunction) _wrap_PrintPreview_DetermineScaling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PrintPreview_swigregister", PrintPreview_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyPrintPreview", _wrap_new_PyPrintPreview, METH_VARARGS, NULL },
+        { (char *)"PyPrintPreview__setCallbackInfo", (PyCFunction) _wrap_PyPrintPreview__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_base_SetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_PaintPage", (PyCFunction) _wrap_PyPrintPreview_base_PaintPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_DrawBlankPage", (PyCFunction) _wrap_PyPrintPreview_base_DrawBlankPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_RenderPage", (PyCFunction) _wrap_PyPrintPreview_base_RenderPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_SetZoom", (PyCFunction) _wrap_PyPrintPreview_base_SetZoom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_Print", (PyCFunction) _wrap_PyPrintPreview_base_Print, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_base_DetermineScaling", (PyCFunction) _wrap_PyPrintPreview_base_DetermineScaling, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPrintPreview_swigregister", PyPrintPreview_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyPreviewFrame", (PyCFunction) _wrap_new_PyPreviewFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame__setCallbackInfo", (PyCFunction) _wrap_PyPreviewFrame__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame_SetPreviewCanvas", (PyCFunction) _wrap_PyPreviewFrame_SetPreviewCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame_SetControlBar", (PyCFunction) _wrap_PyPreviewFrame_SetControlBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame_base_Initialize", (PyCFunction) _wrap_PyPreviewFrame_base_Initialize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame_base_CreateCanvas", (PyCFunction) _wrap_PyPreviewFrame_base_CreateCanvas, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame_base_CreateControlBar", (PyCFunction) _wrap_PyPreviewFrame_base_CreateControlBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewFrame_swigregister", PyPreviewFrame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyPreviewControlBar", (PyCFunction) _wrap_new_PyPreviewControlBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewControlBar__setCallbackInfo", (PyCFunction) _wrap_PyPreviewControlBar__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewControlBar_SetPrintPreview", (PyCFunction) _wrap_PyPreviewControlBar_SetPrintPreview, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewControlBar_base_CreateButtons", (PyCFunction) _wrap_PyPreviewControlBar_base_CreateButtons, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewControlBar_base_SetZoomControl", (PyCFunction) _wrap_PyPreviewControlBar_base_SetZoomControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyPreviewControlBar_swigregister", PyPreviewControlBar_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -26692,7 +26794,7 @@ _swigt__p_wxPrintDialogData,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -26723,94 +26825,96 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"DialogNameStr",_wrap_DialogNameStr_get, _wrap_DialogNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"StatusLineNameStr",_wrap_StatusLineNameStr_get, _wrap_StatusLineNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"ToolBarNameStr",_wrap_ToolBarNameStr_get, _wrap_ToolBarNameStr_set);
-    PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_FromInt((int)wxSTAY_ON_TOP));
-    PyDict_SetItemString(d,"ICONIZE", SWIG_FromInt((int)wxICONIZE));
-    PyDict_SetItemString(d,"MINIMIZE", SWIG_FromInt((int)wxMINIMIZE));
-    PyDict_SetItemString(d,"MAXIMIZE", SWIG_FromInt((int)wxMAXIMIZE));
-    PyDict_SetItemString(d,"CLOSE_BOX", SWIG_FromInt((int)wxCLOSE_BOX));
-    PyDict_SetItemString(d,"THICK_FRAME", SWIG_FromInt((int)wxTHICK_FRAME));
-    PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_FromInt((int)wxSYSTEM_MENU));
-    PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_FromInt((int)wxMINIMIZE_BOX));
-    PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_FromInt((int)wxMAXIMIZE_BOX));
-    PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_FromInt((int)wxTINY_CAPTION_HORIZ));
-    PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_FromInt((int)wxTINY_CAPTION_VERT));
-    PyDict_SetItemString(d,"RESIZE_BOX", SWIG_FromInt((int)wxRESIZE_BOX));
-    PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_FromInt((int)wxRESIZE_BORDER));
-    PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_FromInt((int)wxDIALOG_NO_PARENT));
-    PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_FromInt((int)wxDEFAULT_FRAME_STYLE));
-    PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_FromInt((int)wxDEFAULT_DIALOG_STYLE));
-    PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_FromInt((int)wxFRAME_TOOL_WINDOW));
-    PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_FromInt((int)wxFRAME_FLOAT_ON_PARENT));
-    PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_FromInt((int)wxFRAME_NO_WINDOW_MENU));
-    PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_FromInt((int)wxFRAME_NO_TASKBAR));
-    PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_FromInt((int)wxFRAME_SHAPED));
-    PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_FromInt((int)wxDIALOG_MODAL));
-    PyDict_SetItemString(d,"DIALOG_MODELESS", SWIG_FromInt((int)wxDIALOG_MODELESS));
-    PyDict_SetItemString(d,"USER_COLOURS", SWIG_FromInt((int)wxUSER_COLOURS));
-    PyDict_SetItemString(d,"NO_3D", SWIG_FromInt((int)wxNO_3D));
-    PyDict_SetItemString(d,"FULLSCREEN_NOMENUBAR", SWIG_FromInt((int)wxFULLSCREEN_NOMENUBAR));
-    PyDict_SetItemString(d,"FULLSCREEN_NOTOOLBAR", SWIG_FromInt((int)wxFULLSCREEN_NOTOOLBAR));
-    PyDict_SetItemString(d,"FULLSCREEN_NOSTATUSBAR", SWIG_FromInt((int)wxFULLSCREEN_NOSTATUSBAR));
-    PyDict_SetItemString(d,"FULLSCREEN_NOBORDER", SWIG_FromInt((int)wxFULLSCREEN_NOBORDER));
-    PyDict_SetItemString(d,"FULLSCREEN_NOCAPTION", SWIG_FromInt((int)wxFULLSCREEN_NOCAPTION));
-    PyDict_SetItemString(d,"FULLSCREEN_ALL", SWIG_FromInt((int)wxFULLSCREEN_ALL));
-    PyDict_SetItemString(d,"TOPLEVEL_EX_DIALOG", SWIG_FromInt((int)wxTOPLEVEL_EX_DIALOG));
-    PyDict_SetItemString(d,"SPLASH_CENTRE_ON_PARENT", SWIG_FromInt((int)wxSPLASH_CENTRE_ON_PARENT));
-    PyDict_SetItemString(d,"SPLASH_CENTRE_ON_SCREEN", SWIG_FromInt((int)wxSPLASH_CENTRE_ON_SCREEN));
-    PyDict_SetItemString(d,"SPLASH_NO_CENTRE", SWIG_FromInt((int)wxSPLASH_NO_CENTRE));
-    PyDict_SetItemString(d,"SPLASH_TIMEOUT", SWIG_FromInt((int)wxSPLASH_TIMEOUT));
-    PyDict_SetItemString(d,"SPLASH_NO_TIMEOUT", SWIG_FromInt((int)wxSPLASH_NO_TIMEOUT));
-    PyDict_SetItemString(d,"SB_NORMAL", SWIG_FromInt((int)wxSB_NORMAL));
-    PyDict_SetItemString(d,"SB_FLAT", SWIG_FromInt((int)wxSB_FLAT));
-    PyDict_SetItemString(d,"SB_RAISED", SWIG_FromInt((int)wxSB_RAISED));
+    PyDict_SetItemString(d,"STAY_ON_TOP", SWIG_From_int((int)wxSTAY_ON_TOP));
+    PyDict_SetItemString(d,"ICONIZE", SWIG_From_int((int)wxICONIZE));
+    PyDict_SetItemString(d,"MINIMIZE", SWIG_From_int((int)wxMINIMIZE));
+    PyDict_SetItemString(d,"MAXIMIZE", SWIG_From_int((int)wxMAXIMIZE));
+    PyDict_SetItemString(d,"CLOSE_BOX", SWIG_From_int((int)wxCLOSE_BOX));
+    PyDict_SetItemString(d,"THICK_FRAME", SWIG_From_int((int)wxTHICK_FRAME));
+    PyDict_SetItemString(d,"SYSTEM_MENU", SWIG_From_int((int)wxSYSTEM_MENU));
+    PyDict_SetItemString(d,"MINIMIZE_BOX", SWIG_From_int((int)wxMINIMIZE_BOX));
+    PyDict_SetItemString(d,"MAXIMIZE_BOX", SWIG_From_int((int)wxMAXIMIZE_BOX));
+    PyDict_SetItemString(d,"TINY_CAPTION_HORIZ", SWIG_From_int((int)wxTINY_CAPTION_HORIZ));
+    PyDict_SetItemString(d,"TINY_CAPTION_VERT", SWIG_From_int((int)wxTINY_CAPTION_VERT));
+    PyDict_SetItemString(d,"RESIZE_BOX", SWIG_From_int((int)wxRESIZE_BOX));
+    PyDict_SetItemString(d,"RESIZE_BORDER", SWIG_From_int((int)wxRESIZE_BORDER));
+    PyDict_SetItemString(d,"DIALOG_NO_PARENT", SWIG_From_int((int)wxDIALOG_NO_PARENT));
+    PyDict_SetItemString(d,"DEFAULT_FRAME_STYLE", SWIG_From_int((int)wxDEFAULT_FRAME_STYLE));
+    PyDict_SetItemString(d,"DEFAULT_DIALOG_STYLE", SWIG_From_int((int)wxDEFAULT_DIALOG_STYLE));
+    PyDict_SetItemString(d,"FRAME_TOOL_WINDOW", SWIG_From_int((int)wxFRAME_TOOL_WINDOW));
+    PyDict_SetItemString(d,"FRAME_FLOAT_ON_PARENT", SWIG_From_int((int)wxFRAME_FLOAT_ON_PARENT));
+    PyDict_SetItemString(d,"FRAME_NO_WINDOW_MENU", SWIG_From_int((int)wxFRAME_NO_WINDOW_MENU));
+    PyDict_SetItemString(d,"FRAME_NO_TASKBAR", SWIG_From_int((int)wxFRAME_NO_TASKBAR));
+    PyDict_SetItemString(d,"FRAME_SHAPED", SWIG_From_int((int)wxFRAME_SHAPED));
+    PyDict_SetItemString(d,"DIALOG_MODAL", SWIG_From_int((int)wxDIALOG_MODAL));
+    PyDict_SetItemString(d,"DIALOG_MODELESS", SWIG_From_int((int)wxDIALOG_MODELESS));
+    PyDict_SetItemString(d,"USER_COLOURS", SWIG_From_int((int)wxUSER_COLOURS));
+    PyDict_SetItemString(d,"NO_3D", SWIG_From_int((int)wxNO_3D));
+    PyDict_SetItemString(d,"FULLSCREEN_NOMENUBAR", SWIG_From_int((int)wxFULLSCREEN_NOMENUBAR));
+    PyDict_SetItemString(d,"FULLSCREEN_NOTOOLBAR", SWIG_From_int((int)wxFULLSCREEN_NOTOOLBAR));
+    PyDict_SetItemString(d,"FULLSCREEN_NOSTATUSBAR", SWIG_From_int((int)wxFULLSCREEN_NOSTATUSBAR));
+    PyDict_SetItemString(d,"FULLSCREEN_NOBORDER", SWIG_From_int((int)wxFULLSCREEN_NOBORDER));
+    PyDict_SetItemString(d,"FULLSCREEN_NOCAPTION", SWIG_From_int((int)wxFULLSCREEN_NOCAPTION));
+    PyDict_SetItemString(d,"FULLSCREEN_ALL", SWIG_From_int((int)wxFULLSCREEN_ALL));
+    PyDict_SetItemString(d,"TOPLEVEL_EX_DIALOG", SWIG_From_int((int)wxTOPLEVEL_EX_DIALOG));
+    PyDict_SetItemString(d,"USER_ATTENTION_INFO", SWIG_From_int((int)wxUSER_ATTENTION_INFO));
+    PyDict_SetItemString(d,"USER_ATTENTION_ERROR", SWIG_From_int((int)wxUSER_ATTENTION_ERROR));
+    PyDict_SetItemString(d,"SPLASH_CENTRE_ON_PARENT", SWIG_From_int((int)wxSPLASH_CENTRE_ON_PARENT));
+    PyDict_SetItemString(d,"SPLASH_CENTRE_ON_SCREEN", SWIG_From_int((int)wxSPLASH_CENTRE_ON_SCREEN));
+    PyDict_SetItemString(d,"SPLASH_NO_CENTRE", SWIG_From_int((int)wxSPLASH_NO_CENTRE));
+    PyDict_SetItemString(d,"SPLASH_TIMEOUT", SWIG_From_int((int)wxSPLASH_TIMEOUT));
+    PyDict_SetItemString(d,"SPLASH_NO_TIMEOUT", SWIG_From_int((int)wxSPLASH_NO_TIMEOUT));
+    PyDict_SetItemString(d,"SB_NORMAL", SWIG_From_int((int)wxSB_NORMAL));
+    PyDict_SetItemString(d,"SB_FLAT", SWIG_From_int((int)wxSB_FLAT));
+    PyDict_SetItemString(d,"SB_RAISED", SWIG_From_int((int)wxSB_RAISED));
     SWIG_addvarlink(SWIG_globals,(char*)"SplitterNameStr",_wrap_SplitterNameStr_get, _wrap_SplitterNameStr_set);
-    PyDict_SetItemString(d,"SP_NOBORDER", SWIG_FromInt((int)wxSP_NOBORDER));
-    PyDict_SetItemString(d,"SP_NOSASH", SWIG_FromInt((int)wxSP_NOSASH));
-    PyDict_SetItemString(d,"SP_PERMIT_UNSPLIT", SWIG_FromInt((int)wxSP_PERMIT_UNSPLIT));
-    PyDict_SetItemString(d,"SP_LIVE_UPDATE", SWIG_FromInt((int)wxSP_LIVE_UPDATE));
-    PyDict_SetItemString(d,"SP_3DSASH", SWIG_FromInt((int)wxSP_3DSASH));
-    PyDict_SetItemString(d,"SP_3DBORDER", SWIG_FromInt((int)wxSP_3DBORDER));
-    PyDict_SetItemString(d,"SP_NO_XP_THEME", SWIG_FromInt((int)wxSP_NO_XP_THEME));
-    PyDict_SetItemString(d,"SP_BORDER", SWIG_FromInt((int)wxSP_BORDER));
-    PyDict_SetItemString(d,"SP_3D", SWIG_FromInt((int)wxSP_3D));
-    PyDict_SetItemString(d,"SPLIT_HORIZONTAL", SWIG_FromInt((int)wxSPLIT_HORIZONTAL));
-    PyDict_SetItemString(d,"SPLIT_VERTICAL", SWIG_FromInt((int)wxSPLIT_VERTICAL));
-    PyDict_SetItemString(d,"SPLIT_DRAG_NONE", SWIG_FromInt((int)wxSPLIT_DRAG_NONE));
-    PyDict_SetItemString(d,"SPLIT_DRAG_DRAGGING", SWIG_FromInt((int)wxSPLIT_DRAG_DRAGGING));
-    PyDict_SetItemString(d,"SPLIT_DRAG_LEFT_DOWN", SWIG_FromInt((int)wxSPLIT_DRAG_LEFT_DOWN));
+    PyDict_SetItemString(d,"SP_NOBORDER", SWIG_From_int((int)wxSP_NOBORDER));
+    PyDict_SetItemString(d,"SP_NOSASH", SWIG_From_int((int)wxSP_NOSASH));
+    PyDict_SetItemString(d,"SP_PERMIT_UNSPLIT", SWIG_From_int((int)wxSP_PERMIT_UNSPLIT));
+    PyDict_SetItemString(d,"SP_LIVE_UPDATE", SWIG_From_int((int)wxSP_LIVE_UPDATE));
+    PyDict_SetItemString(d,"SP_3DSASH", SWIG_From_int((int)wxSP_3DSASH));
+    PyDict_SetItemString(d,"SP_3DBORDER", SWIG_From_int((int)wxSP_3DBORDER));
+    PyDict_SetItemString(d,"SP_NO_XP_THEME", SWIG_From_int((int)wxSP_NO_XP_THEME));
+    PyDict_SetItemString(d,"SP_BORDER", SWIG_From_int((int)wxSP_BORDER));
+    PyDict_SetItemString(d,"SP_3D", SWIG_From_int((int)wxSP_3D));
+    PyDict_SetItemString(d,"SPLIT_HORIZONTAL", SWIG_From_int((int)wxSPLIT_HORIZONTAL));
+    PyDict_SetItemString(d,"SPLIT_VERTICAL", SWIG_From_int((int)wxSPLIT_VERTICAL));
+    PyDict_SetItemString(d,"SPLIT_DRAG_NONE", SWIG_From_int((int)wxSPLIT_DRAG_NONE));
+    PyDict_SetItemString(d,"SPLIT_DRAG_DRAGGING", SWIG_From_int((int)wxSPLIT_DRAG_DRAGGING));
+    PyDict_SetItemString(d,"SPLIT_DRAG_LEFT_DOWN", SWIG_From_int((int)wxSPLIT_DRAG_LEFT_DOWN));
     PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED));
     PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING));
     PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_DOUBLECLICKED", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED));
     PyDict_SetItemString(d, "wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong(wxEVT_COMMAND_SPLITTER_UNSPLIT));
     SWIG_addvarlink(SWIG_globals,(char*)"SashNameStr",_wrap_SashNameStr_get, _wrap_SashNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"SashLayoutNameStr",_wrap_SashLayoutNameStr_get, _wrap_SashLayoutNameStr_set);
-    PyDict_SetItemString(d,"SASH_DRAG_NONE", SWIG_FromInt((int)wxSASH_DRAG_NONE));
-    PyDict_SetItemString(d,"SASH_DRAG_DRAGGING", SWIG_FromInt((int)wxSASH_DRAG_DRAGGING));
-    PyDict_SetItemString(d,"SASH_DRAG_LEFT_DOWN", SWIG_FromInt((int)wxSASH_DRAG_LEFT_DOWN));
-    PyDict_SetItemString(d,"SW_NOBORDER", SWIG_FromInt((int)wxSW_NOBORDER));
-    PyDict_SetItemString(d,"SW_BORDER", SWIG_FromInt((int)wxSW_BORDER));
-    PyDict_SetItemString(d,"SW_3DSASH", SWIG_FromInt((int)wxSW_3DSASH));
-    PyDict_SetItemString(d,"SW_3DBORDER", SWIG_FromInt((int)wxSW_3DBORDER));
-    PyDict_SetItemString(d,"SW_3D", SWIG_FromInt((int)wxSW_3D));
-    PyDict_SetItemString(d,"SASH_TOP", SWIG_FromInt((int)wxSASH_TOP));
-    PyDict_SetItemString(d,"SASH_RIGHT", SWIG_FromInt((int)wxSASH_RIGHT));
-    PyDict_SetItemString(d,"SASH_BOTTOM", SWIG_FromInt((int)wxSASH_BOTTOM));
-    PyDict_SetItemString(d,"SASH_LEFT", SWIG_FromInt((int)wxSASH_LEFT));
-    PyDict_SetItemString(d,"SASH_NONE", SWIG_FromInt((int)wxSASH_NONE));
-    PyDict_SetItemString(d,"SASH_STATUS_OK", SWIG_FromInt((int)wxSASH_STATUS_OK));
-    PyDict_SetItemString(d,"SASH_STATUS_OUT_OF_RANGE", SWIG_FromInt((int)wxSASH_STATUS_OUT_OF_RANGE));
+    PyDict_SetItemString(d,"SASH_DRAG_NONE", SWIG_From_int((int)wxSASH_DRAG_NONE));
+    PyDict_SetItemString(d,"SASH_DRAG_DRAGGING", SWIG_From_int((int)wxSASH_DRAG_DRAGGING));
+    PyDict_SetItemString(d,"SASH_DRAG_LEFT_DOWN", SWIG_From_int((int)wxSASH_DRAG_LEFT_DOWN));
+    PyDict_SetItemString(d,"SW_NOBORDER", SWIG_From_int((int)wxSW_NOBORDER));
+    PyDict_SetItemString(d,"SW_BORDER", SWIG_From_int((int)wxSW_BORDER));
+    PyDict_SetItemString(d,"SW_3DSASH", SWIG_From_int((int)wxSW_3DSASH));
+    PyDict_SetItemString(d,"SW_3DBORDER", SWIG_From_int((int)wxSW_3DBORDER));
+    PyDict_SetItemString(d,"SW_3D", SWIG_From_int((int)wxSW_3D));
+    PyDict_SetItemString(d,"SASH_TOP", SWIG_From_int((int)wxSASH_TOP));
+    PyDict_SetItemString(d,"SASH_RIGHT", SWIG_From_int((int)wxSASH_RIGHT));
+    PyDict_SetItemString(d,"SASH_BOTTOM", SWIG_From_int((int)wxSASH_BOTTOM));
+    PyDict_SetItemString(d,"SASH_LEFT", SWIG_From_int((int)wxSASH_LEFT));
+    PyDict_SetItemString(d,"SASH_NONE", SWIG_From_int((int)wxSASH_NONE));
+    PyDict_SetItemString(d,"SASH_STATUS_OK", SWIG_From_int((int)wxSASH_STATUS_OK));
+    PyDict_SetItemString(d,"SASH_STATUS_OUT_OF_RANGE", SWIG_From_int((int)wxSASH_STATUS_OUT_OF_RANGE));
     PyDict_SetItemString(d, "wxEVT_SASH_DRAGGED", PyInt_FromLong(wxEVT_SASH_DRAGGED));
-    PyDict_SetItemString(d,"LAYOUT_HORIZONTAL", SWIG_FromInt((int)wxLAYOUT_HORIZONTAL));
-    PyDict_SetItemString(d,"LAYOUT_VERTICAL", SWIG_FromInt((int)wxLAYOUT_VERTICAL));
-    PyDict_SetItemString(d,"LAYOUT_NONE", SWIG_FromInt((int)wxLAYOUT_NONE));
-    PyDict_SetItemString(d,"LAYOUT_TOP", SWIG_FromInt((int)wxLAYOUT_TOP));
-    PyDict_SetItemString(d,"LAYOUT_LEFT", SWIG_FromInt((int)wxLAYOUT_LEFT));
-    PyDict_SetItemString(d,"LAYOUT_RIGHT", SWIG_FromInt((int)wxLAYOUT_RIGHT));
-    PyDict_SetItemString(d,"LAYOUT_BOTTOM", SWIG_FromInt((int)wxLAYOUT_BOTTOM));
-    PyDict_SetItemString(d,"LAYOUT_LENGTH_Y", SWIG_FromInt((int)wxLAYOUT_LENGTH_Y));
-    PyDict_SetItemString(d,"LAYOUT_LENGTH_X", SWIG_FromInt((int)wxLAYOUT_LENGTH_X));
-    PyDict_SetItemString(d,"LAYOUT_MRU_LENGTH", SWIG_FromInt((int)wxLAYOUT_MRU_LENGTH));
-    PyDict_SetItemString(d,"LAYOUT_QUERY", SWIG_FromInt((int)wxLAYOUT_QUERY));
+    PyDict_SetItemString(d,"LAYOUT_HORIZONTAL", SWIG_From_int((int)wxLAYOUT_HORIZONTAL));
+    PyDict_SetItemString(d,"LAYOUT_VERTICAL", SWIG_From_int((int)wxLAYOUT_VERTICAL));
+    PyDict_SetItemString(d,"LAYOUT_NONE", SWIG_From_int((int)wxLAYOUT_NONE));
+    PyDict_SetItemString(d,"LAYOUT_TOP", SWIG_From_int((int)wxLAYOUT_TOP));
+    PyDict_SetItemString(d,"LAYOUT_LEFT", SWIG_From_int((int)wxLAYOUT_LEFT));
+    PyDict_SetItemString(d,"LAYOUT_RIGHT", SWIG_From_int((int)wxLAYOUT_RIGHT));
+    PyDict_SetItemString(d,"LAYOUT_BOTTOM", SWIG_From_int((int)wxLAYOUT_BOTTOM));
+    PyDict_SetItemString(d,"LAYOUT_LENGTH_Y", SWIG_From_int((int)wxLAYOUT_LENGTH_Y));
+    PyDict_SetItemString(d,"LAYOUT_LENGTH_X", SWIG_From_int((int)wxLAYOUT_LENGTH_X));
+    PyDict_SetItemString(d,"LAYOUT_MRU_LENGTH", SWIG_From_int((int)wxLAYOUT_MRU_LENGTH));
+    PyDict_SetItemString(d,"LAYOUT_QUERY", SWIG_From_int((int)wxLAYOUT_QUERY));
     PyDict_SetItemString(d, "wxEVT_QUERY_LAYOUT_INFO", PyInt_FromLong(wxEVT_QUERY_LAYOUT_INFO));
     PyDict_SetItemString(d, "wxEVT_CALCULATE_LAYOUT", PyInt_FromLong(wxEVT_CALCULATE_LAYOUT));
     SWIG_addvarlink(SWIG_globals,(char*)"VListBoxNameStr",_wrap_VListBoxNameStr_get, _wrap_VListBoxNameStr_set);
@@ -26833,53 +26937,53 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"FileSelectorDefaultWildcardStr",_wrap_FileSelectorDefaultWildcardStr_get, _wrap_FileSelectorDefaultWildcardStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"GetTextFromUserPromptStr",_wrap_GetTextFromUserPromptStr_get, _wrap_GetTextFromUserPromptStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"MessageBoxCaptionStr",_wrap_MessageBoxCaptionStr_get, _wrap_MessageBoxCaptionStr_set);
-    PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_FromInt((int)wxCHOICEDLG_STYLE));
-    PyDict_SetItemString(d,"FR_DOWN", SWIG_FromInt((int)wxFR_DOWN));
-    PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_FromInt((int)wxFR_WHOLEWORD));
-    PyDict_SetItemString(d,"FR_MATCHCASE", SWIG_FromInt((int)wxFR_MATCHCASE));
-    PyDict_SetItemString(d,"FR_REPLACEDIALOG", SWIG_FromInt((int)wxFR_REPLACEDIALOG));
-    PyDict_SetItemString(d,"FR_NOUPDOWN", SWIG_FromInt((int)wxFR_NOUPDOWN));
-    PyDict_SetItemString(d,"FR_NOMATCHCASE", SWIG_FromInt((int)wxFR_NOMATCHCASE));
-    PyDict_SetItemString(d,"FR_NOWHOLEWORD", SWIG_FromInt((int)wxFR_NOWHOLEWORD));
+    PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_From_int((int)wxCHOICEDLG_STYLE));
+    PyDict_SetItemString(d,"FR_DOWN", SWIG_From_int((int)wxFR_DOWN));
+    PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_From_int((int)wxFR_WHOLEWORD));
+    PyDict_SetItemString(d,"FR_MATCHCASE", SWIG_From_int((int)wxFR_MATCHCASE));
+    PyDict_SetItemString(d,"FR_REPLACEDIALOG", SWIG_From_int((int)wxFR_REPLACEDIALOG));
+    PyDict_SetItemString(d,"FR_NOUPDOWN", SWIG_From_int((int)wxFR_NOUPDOWN));
+    PyDict_SetItemString(d,"FR_NOMATCHCASE", SWIG_From_int((int)wxFR_NOMATCHCASE));
+    PyDict_SetItemString(d,"FR_NOWHOLEWORD", SWIG_From_int((int)wxFR_NOWHOLEWORD));
     PyDict_SetItemString(d, "wxEVT_COMMAND_FIND", PyInt_FromLong(wxEVT_COMMAND_FIND));
     PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_NEXT", PyInt_FromLong(wxEVT_COMMAND_FIND_NEXT));
     PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE));
     PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_REPLACE_ALL", PyInt_FromLong(wxEVT_COMMAND_FIND_REPLACE_ALL));
     PyDict_SetItemString(d, "wxEVT_COMMAND_FIND_CLOSE", PyInt_FromLong(wxEVT_COMMAND_FIND_CLOSE));
-    PyDict_SetItemString(d,"IDM_WINDOWTILE", SWIG_FromInt((int)4001));
-    PyDict_SetItemString(d,"IDM_WINDOWTILEHOR", SWIG_FromInt((int)4001));
-    PyDict_SetItemString(d,"IDM_WINDOWCASCADE", SWIG_FromInt((int)4002));
-    PyDict_SetItemString(d,"IDM_WINDOWICONS", SWIG_FromInt((int)4003));
-    PyDict_SetItemString(d,"IDM_WINDOWNEXT", SWIG_FromInt((int)4004));
-    PyDict_SetItemString(d,"IDM_WINDOWTILEVERT", SWIG_FromInt((int)4005));
-    PyDict_SetItemString(d,"FIRST_MDI_CHILD", SWIG_FromInt((int)4100));
-    PyDict_SetItemString(d,"LAST_MDI_CHILD", SWIG_FromInt((int)4600));
+    PyDict_SetItemString(d,"IDM_WINDOWTILE", SWIG_From_int((int)4001));
+    PyDict_SetItemString(d,"IDM_WINDOWTILEHOR", SWIG_From_int((int)4001));
+    PyDict_SetItemString(d,"IDM_WINDOWCASCADE", SWIG_From_int((int)4002));
+    PyDict_SetItemString(d,"IDM_WINDOWICONS", SWIG_From_int((int)4003));
+    PyDict_SetItemString(d,"IDM_WINDOWNEXT", SWIG_From_int((int)4004));
+    PyDict_SetItemString(d,"IDM_WINDOWTILEVERT", SWIG_From_int((int)4005));
+    PyDict_SetItemString(d,"FIRST_MDI_CHILD", SWIG_From_int((int)4100));
+    PyDict_SetItemString(d,"LAST_MDI_CHILD", SWIG_From_int((int)4600));
     SWIG_addvarlink(SWIG_globals,(char*)"PrintoutTitleStr",_wrap_PrintoutTitleStr_get, _wrap_PrintoutTitleStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"PreviewCanvasNameStr",_wrap_PreviewCanvasNameStr_get, _wrap_PreviewCanvasNameStr_set);
-    PyDict_SetItemString(d,"PRINT_MODE_NONE", SWIG_FromInt((int)wxPRINT_MODE_NONE));
-    PyDict_SetItemString(d,"PRINT_MODE_PREVIEW", SWIG_FromInt((int)wxPRINT_MODE_PREVIEW));
-    PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_FromInt((int)wxPRINT_MODE_FILE));
-    PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_FromInt((int)wxPRINT_MODE_PRINTER));
-    PyDict_SetItemString(d,"PRINT_MODE_STREAM", SWIG_FromInt((int)wxPRINT_MODE_STREAM));
-    PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_FromInt((int)wxPRINTER_NO_ERROR));
-    PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_FromInt((int)wxPRINTER_CANCELLED));
-    PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_FromInt((int)wxPRINTER_ERROR));
-    PyDict_SetItemString(d,"PREVIEW_PRINT", SWIG_FromInt((int)wxPREVIEW_PRINT));
-    PyDict_SetItemString(d,"PREVIEW_PREVIOUS", SWIG_FromInt((int)wxPREVIEW_PREVIOUS));
-    PyDict_SetItemString(d,"PREVIEW_NEXT", SWIG_FromInt((int)wxPREVIEW_NEXT));
-    PyDict_SetItemString(d,"PREVIEW_ZOOM", SWIG_FromInt((int)wxPREVIEW_ZOOM));
-    PyDict_SetItemString(d,"PREVIEW_FIRST", SWIG_FromInt((int)wxPREVIEW_FIRST));
-    PyDict_SetItemString(d,"PREVIEW_LAST", SWIG_FromInt((int)wxPREVIEW_LAST));
-    PyDict_SetItemString(d,"PREVIEW_GOTO", SWIG_FromInt((int)wxPREVIEW_GOTO));
-    PyDict_SetItemString(d,"PREVIEW_DEFAULT", SWIG_FromInt((int)wxPREVIEW_DEFAULT));
-    PyDict_SetItemString(d,"ID_PREVIEW_CLOSE", SWIG_FromInt((int)wxID_PREVIEW_CLOSE));
-    PyDict_SetItemString(d,"ID_PREVIEW_NEXT", SWIG_FromInt((int)wxID_PREVIEW_NEXT));
-    PyDict_SetItemString(d,"ID_PREVIEW_PREVIOUS", SWIG_FromInt((int)wxID_PREVIEW_PREVIOUS));
-    PyDict_SetItemString(d,"ID_PREVIEW_PRINT", SWIG_FromInt((int)wxID_PREVIEW_PRINT));
-    PyDict_SetItemString(d,"ID_PREVIEW_ZOOM", SWIG_FromInt((int)wxID_PREVIEW_ZOOM));
-    PyDict_SetItemString(d,"ID_PREVIEW_FIRST", SWIG_FromInt((int)wxID_PREVIEW_FIRST));
-    PyDict_SetItemString(d,"ID_PREVIEW_LAST", SWIG_FromInt((int)wxID_PREVIEW_LAST));
-    PyDict_SetItemString(d,"ID_PREVIEW_GOTO", SWIG_FromInt((int)wxID_PREVIEW_GOTO));
+    PyDict_SetItemString(d,"PRINT_MODE_NONE", SWIG_From_int((int)wxPRINT_MODE_NONE));
+    PyDict_SetItemString(d,"PRINT_MODE_PREVIEW", SWIG_From_int((int)wxPRINT_MODE_PREVIEW));
+    PyDict_SetItemString(d,"PRINT_MODE_FILE", SWIG_From_int((int)wxPRINT_MODE_FILE));
+    PyDict_SetItemString(d,"PRINT_MODE_PRINTER", SWIG_From_int((int)wxPRINT_MODE_PRINTER));
+    PyDict_SetItemString(d,"PRINT_MODE_STREAM", SWIG_From_int((int)wxPRINT_MODE_STREAM));
+    PyDict_SetItemString(d,"PRINTER_NO_ERROR", SWIG_From_int((int)wxPRINTER_NO_ERROR));
+    PyDict_SetItemString(d,"PRINTER_CANCELLED", SWIG_From_int((int)wxPRINTER_CANCELLED));
+    PyDict_SetItemString(d,"PRINTER_ERROR", SWIG_From_int((int)wxPRINTER_ERROR));
+    PyDict_SetItemString(d,"PREVIEW_PRINT", SWIG_From_int((int)wxPREVIEW_PRINT));
+    PyDict_SetItemString(d,"PREVIEW_PREVIOUS", SWIG_From_int((int)wxPREVIEW_PREVIOUS));
+    PyDict_SetItemString(d,"PREVIEW_NEXT", SWIG_From_int((int)wxPREVIEW_NEXT));
+    PyDict_SetItemString(d,"PREVIEW_ZOOM", SWIG_From_int((int)wxPREVIEW_ZOOM));
+    PyDict_SetItemString(d,"PREVIEW_FIRST", SWIG_From_int((int)wxPREVIEW_FIRST));
+    PyDict_SetItemString(d,"PREVIEW_LAST", SWIG_From_int((int)wxPREVIEW_LAST));
+    PyDict_SetItemString(d,"PREVIEW_GOTO", SWIG_From_int((int)wxPREVIEW_GOTO));
+    PyDict_SetItemString(d,"PREVIEW_DEFAULT", SWIG_From_int((int)wxPREVIEW_DEFAULT));
+    PyDict_SetItemString(d,"ID_PREVIEW_CLOSE", SWIG_From_int((int)wxID_PREVIEW_CLOSE));
+    PyDict_SetItemString(d,"ID_PREVIEW_NEXT", SWIG_From_int((int)wxID_PREVIEW_NEXT));
+    PyDict_SetItemString(d,"ID_PREVIEW_PREVIOUS", SWIG_From_int((int)wxID_PREVIEW_PREVIOUS));
+    PyDict_SetItemString(d,"ID_PREVIEW_PRINT", SWIG_From_int((int)wxID_PREVIEW_PRINT));
+    PyDict_SetItemString(d,"ID_PREVIEW_ZOOM", SWIG_From_int((int)wxID_PREVIEW_ZOOM));
+    PyDict_SetItemString(d,"ID_PREVIEW_FIRST", SWIG_From_int((int)wxID_PREVIEW_FIRST));
+    PyDict_SetItemString(d,"ID_PREVIEW_LAST", SWIG_From_int((int)wxID_PREVIEW_LAST));
+    PyDict_SetItemString(d,"ID_PREVIEW_GOTO", SWIG_From_int((int)wxID_PREVIEW_GOTO));
     
     wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout");
     

diff --git a/wxPython/src/mac/calendar_wrap.cpp b/wxPython/src/mac/calendar_wrap.cpp
index f9ad0676162ce7df5286f2d3db2ff9c19de26e62..2a6c48e6de20831d01865b5d2b2d7652b2a0f19c 100644 (file)
--- a/wxPython/src/mac/calendar_wrap.cpp
+++ b/wxPython/src/mac/calendar_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxColour swig_types[0] 
@@ -232,47 +234,64 @@ static swig_type_info *swig_types[15];
 
 #define SWIG_name    "_calendar"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -284,130 +303,206 @@ static swig_type_info *swig_types[15];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
 }
 
-
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
     return 1;
   }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
- static const wxString wxPyCalendarNameStr(wxCalendarNameStr); 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
+}
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+ static const wxString wxPyCalendarNameStr(wxCalendarNameStr); 
+
+SWIGSTATICINLINE(long)
+SWIG_As_long(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;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
+}
 
+
+// See my_fragments.i
 SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
+    }
+    else if (val)
+        *val = (unsigned long)v;
     return 1;
+}
+
+
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
+{
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 PyObject *wxCalendarCtrl_HitTest(wxCalendarCtrl *self,wxPoint const &pos){
@@ -425,7 +520,7 @@ PyObject *wxCalendarCtrl_HitTest(wxCalendarCtrl *self,wxPoint const &pos){
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalendarDateAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour const &arg1_defvalue = wxNullColour ;
     wxColour *arg1 = (wxColour *) &arg1_defvalue ;
@@ -478,7 +573,7 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb
         }
     }
     if (obj4) {
-        arg5 = (wxCalendarDateBorder) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -495,7 +590,7 @@ static PyObject *_wrap_new_CalendarDateAttr(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -527,7 +622,7 @@ static PyObject *_wrap_CalendarDateAttr_SetTextColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -559,7 +654,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBackgroundColour(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_SetBorderColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetBorderColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -591,7 +686,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBorderColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxFont *arg2 = 0 ;
@@ -625,7 +720,7 @@ static PyObject *_wrap_CalendarDateAttr_SetFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     int arg2 ;
@@ -638,7 +733,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetBorder",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxCalendarDateBorder) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -654,7 +749,7 @@ static PyObject *_wrap_CalendarDateAttr_SetBorder(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool arg2 ;
@@ -667,7 +762,7 @@ static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarDateAttr_SetHoliday",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -683,7 +778,7 @@ static PyObject *_wrap_CalendarDateAttr_SetHoliday(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
@@ -711,7 +806,7 @@ static PyObject *_wrap_CalendarDateAttr_HasTextColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
@@ -739,7 +834,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBackgroundColour(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
@@ -767,7 +862,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorderColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
@@ -795,7 +890,7 @@ static PyObject *_wrap_CalendarDateAttr_HasFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
@@ -823,7 +918,7 @@ static PyObject *_wrap_CalendarDateAttr_HasBorder(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     bool result;
@@ -851,7 +946,7 @@ static PyObject *_wrap_CalendarDateAttr_IsHoliday(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;
@@ -881,7 +976,7 @@ static PyObject *_wrap_CalendarDateAttr_GetTextColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;
@@ -911,7 +1006,7 @@ static PyObject *_wrap_CalendarDateAttr_GetBackgroundColour(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_GetBorderColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetBorderColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxColour result;
@@ -941,7 +1036,7 @@ static PyObject *_wrap_CalendarDateAttr_GetBorderColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     wxFont result;
@@ -971,7 +1066,7 @@ static PyObject *_wrap_CalendarDateAttr_GetFont(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarDateAttr *arg1 = (wxCalendarDateAttr *) 0 ;
     int result;
@@ -990,21 +1085,21 @@ static PyObject *_wrap_CalendarDateAttr_GetBorder(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * CalendarDateAttr_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalendarDateAttr_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarDateAttr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalendarEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxEventType arg2 ;
@@ -1018,7 +1113,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_CalendarEvent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1034,7 +1129,7 @@ static PyObject *_wrap_new_CalendarEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_GetDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     wxDateTime result;
@@ -1064,7 +1159,7 @@ static PyObject *_wrap_CalendarEvent_GetDate(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_CalendarEvent_SetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_SetDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -1098,7 +1193,7 @@ static PyObject *_wrap_CalendarEvent_SetDate(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     int arg2 ;
@@ -1111,7 +1206,7 @@ static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarEvent_SetWeekDay",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxDateTime::WeekDay const) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1127,7 +1222,7 @@ static PyObject *_wrap_CalendarEvent_SetWeekDay(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarEvent *arg1 = (wxCalendarEvent *) 0 ;
     int result;
@@ -1146,21 +1241,21 @@ static PyObject *_wrap_CalendarEvent_GetWeekDay(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * CalendarEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalendarEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static int _wrap_CalendarNameStr_set(PyObject *_val) {
+static int _wrap_CalendarNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable CalendarNameStr is read-only.");
     return 1;
 }
@@ -1180,7 +1275,7 @@ static PyObject *_wrap_CalendarNameStr_get() {
 }
 
 
-static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_CalendarCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1212,7 +1307,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1237,7 +1332,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -1270,7 +1365,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PreCalendarCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreCalendarCtrl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *result;
     char *kwnames[] = {
@@ -1293,7 +1388,7 @@ static PyObject *_wrap_new_PreCalendarCtrl(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1328,7 +1423,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
         if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxDateTime,
@@ -1352,7 +1447,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
         }
     }
     if (obj6) {
-        arg7 = (long) SWIG_AsLong(obj6); 
+        arg7 = (long)SWIG_As_long(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
@@ -1386,7 +1481,7 @@ static PyObject *_wrap_CalendarCtrl_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *arg2 = 0 ;
@@ -1420,7 +1515,7 @@ static PyObject *_wrap_CalendarCtrl_SetDate(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetDate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetDate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;
@@ -1449,7 +1544,7 @@ static PyObject *_wrap_CalendarCtrl_GetDate(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;
@@ -1489,7 +1584,7 @@ static PyObject *_wrap_CalendarCtrl_SetLowerDateLimit(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;
@@ -1529,7 +1624,7 @@ static PyObject *_wrap_CalendarCtrl_SetUpperDateLimit(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetLowerDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetLowerDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;
@@ -1558,7 +1653,7 @@ static PyObject *_wrap_CalendarCtrl_GetLowerDateLimit(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetUpperDateLimit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetUpperDateLimit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime *result;
@@ -1587,7 +1682,7 @@ static PyObject *_wrap_CalendarCtrl_GetUpperDateLimit(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxDateTime const &arg2_defvalue = wxDefaultDateTime ;
@@ -1639,7 +1734,7 @@ static PyObject *_wrap_CalendarCtrl_SetDateRange(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;
@@ -1653,7 +1748,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1670,7 +1765,7 @@ static PyObject *_wrap_CalendarCtrl_EnableYearChange(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;
@@ -1684,7 +1779,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1701,7 +1796,7 @@ static PyObject *_wrap_CalendarCtrl_EnableMonthChange(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     bool arg2 = (bool) True ;
@@ -1715,7 +1810,7 @@ static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1732,7 +1827,7 @@ static PyObject *_wrap_CalendarCtrl_EnableHolidayDisplay(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetHeaderColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHeaderColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -1771,7 +1866,7 @@ static PyObject *_wrap_CalendarCtrl_SetHeaderColours(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetHeaderColourFg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHeaderColourFg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
@@ -1801,7 +1896,7 @@ static PyObject *_wrap_CalendarCtrl_GetHeaderColourFg(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetHeaderColourBg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHeaderColourBg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
@@ -1831,7 +1926,7 @@ static PyObject *_wrap_CalendarCtrl_GetHeaderColourBg(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetHighlightColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHighlightColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -1870,7 +1965,7 @@ static PyObject *_wrap_CalendarCtrl_SetHighlightColours(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetHighlightColourFg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHighlightColourFg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
@@ -1900,7 +1995,7 @@ static PyObject *_wrap_CalendarCtrl_GetHighlightColourFg(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetHighlightColourBg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHighlightColourBg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
@@ -1930,7 +2025,7 @@ static PyObject *_wrap_CalendarCtrl_GetHighlightColourBg(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetHolidayColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHolidayColours(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour *arg2 = 0 ;
@@ -1969,7 +2064,7 @@ static PyObject *_wrap_CalendarCtrl_SetHolidayColours(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetHolidayColourFg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHolidayColourFg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
@@ -1999,7 +2094,7 @@ static PyObject *_wrap_CalendarCtrl_GetHolidayColourFg(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetHolidayColourBg(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetHolidayColourBg(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxColour result;
@@ -2029,7 +2124,7 @@ static PyObject *_wrap_CalendarCtrl_GetHolidayColourBg(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
@@ -2043,7 +2138,7 @@ static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_GetAttr",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2059,7 +2154,7 @@ static PyObject *_wrap_CalendarCtrl_GetAttr(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
@@ -2074,7 +2169,7 @@ static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:CalendarCtrl_SetAttr",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxCalendarDateAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -2092,7 +2187,7 @@ static PyObject *_wrap_CalendarCtrl_SetAttr(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
@@ -2105,7 +2200,7 @@ static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_SetHoliday",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2121,7 +2216,7 @@ static PyObject *_wrap_CalendarCtrl_SetHoliday(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     size_t arg2 ;
@@ -2134,7 +2229,7 @@ static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CalendarCtrl_ResetAttr",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxCalendarCtrl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2150,7 +2245,7 @@ static PyObject *_wrap_CalendarCtrl_ResetAttr(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -2183,7 +2278,7 @@ static PyObject *_wrap_CalendarCtrl_HitTest(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxControl *result;
@@ -2211,7 +2306,7 @@ static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxCalendarCtrl *arg1 = (wxCalendarCtrl *) 0 ;
     wxControl *result;
@@ -2239,7 +2334,7 @@ static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -2250,7 +2345,7 @@ static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:CalendarCtrl_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2272,7 +2367,7 @@ static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, Py
 }
 
 
-static PyObject * CalendarCtrl_swigregister(PyObject *self, PyObject *args) {
+static PyObject * CalendarCtrl_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxCalendarCtrl, obj);
@@ -2280,63 +2375,63 @@ static PyObject * CalendarCtrl_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_CalendarDateAttr", (PyCFunction) _wrap_new_CalendarDateAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetTextColour", (PyCFunction) _wrap_CalendarDateAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_SetBorderColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetFont", (PyCFunction) _wrap_CalendarDateAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetBorder", (PyCFunction) _wrap_CalendarDateAttr_SetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_SetHoliday", (PyCFunction) _wrap_CalendarDateAttr_SetHoliday, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasTextColour", (PyCFunction) _wrap_CalendarDateAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasBorderColour", (PyCFunction) _wrap_CalendarDateAttr_HasBorderColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasFont", (PyCFunction) _wrap_CalendarDateAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_HasBorder", (PyCFunction) _wrap_CalendarDateAttr_HasBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_IsHoliday", (PyCFunction) _wrap_CalendarDateAttr_IsHoliday, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetTextColour", (PyCFunction) _wrap_CalendarDateAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_GetBorderColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetFont", (PyCFunction) _wrap_CalendarDateAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_GetBorder", (PyCFunction) _wrap_CalendarDateAttr_GetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarDateAttr_swigregister", CalendarDateAttr_swigregister, METH_VARARGS },
-        { (char *)"new_CalendarEvent", (PyCFunction) _wrap_new_CalendarEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_GetDate", (PyCFunction) _wrap_CalendarEvent_GetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_SetDate", (PyCFunction) _wrap_CalendarEvent_SetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_SetWeekDay", (PyCFunction) _wrap_CalendarEvent_SetWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_GetWeekDay", (PyCFunction) _wrap_CalendarEvent_GetWeekDay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarEvent_swigregister", CalendarEvent_swigregister, METH_VARARGS },
-        { (char *)"new_CalendarCtrl", (PyCFunction) _wrap_new_CalendarCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreCalendarCtrl", (PyCFunction) _wrap_new_PreCalendarCtrl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_Create", (PyCFunction) _wrap_CalendarCtrl_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetDate", (PyCFunction) _wrap_CalendarCtrl_SetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetDate", (PyCFunction) _wrap_CalendarCtrl_GetDate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetLowerDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetUpperDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetLowerDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetUpperDateLimit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetDateRange", (PyCFunction) _wrap_CalendarCtrl_SetDateRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_EnableYearChange", (PyCFunction) _wrap_CalendarCtrl_EnableYearChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_EnableMonthChange", (PyCFunction) _wrap_CalendarCtrl_EnableMonthChange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_EnableHolidayDisplay", (PyCFunction) _wrap_CalendarCtrl_EnableHolidayDisplay, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHeaderColours", (PyCFunction) _wrap_CalendarCtrl_SetHeaderColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHeaderColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourFg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHeaderColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourBg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHighlightColours", (PyCFunction) _wrap_CalendarCtrl_SetHighlightColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHighlightColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourFg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHighlightColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourBg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHolidayColours", (PyCFunction) _wrap_CalendarCtrl_SetHolidayColours, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHolidayColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourFg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetHolidayColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourBg, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetAttr", (PyCFunction) _wrap_CalendarCtrl_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetAttr", (PyCFunction) _wrap_CalendarCtrl_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_SetHoliday", (PyCFunction) _wrap_CalendarCtrl_SetHoliday, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_ResetAttr", (PyCFunction) _wrap_CalendarCtrl_ResetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_HitTest", (PyCFunction) _wrap_CalendarCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetMonthControl", (PyCFunction) _wrap_CalendarCtrl_GetMonthControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetYearControl", (PyCFunction) _wrap_CalendarCtrl_GetYearControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_CalendarCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"CalendarCtrl_swigregister", CalendarCtrl_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_CalendarDateAttr", (PyCFunction) _wrap_new_CalendarDateAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetTextColour", (PyCFunction) _wrap_CalendarDateAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_SetBorderColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetFont", (PyCFunction) _wrap_CalendarDateAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetBorder", (PyCFunction) _wrap_CalendarDateAttr_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_SetHoliday", (PyCFunction) _wrap_CalendarDateAttr_SetHoliday, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasTextColour", (PyCFunction) _wrap_CalendarDateAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasBorderColour", (PyCFunction) _wrap_CalendarDateAttr_HasBorderColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasFont", (PyCFunction) _wrap_CalendarDateAttr_HasFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_HasBorder", (PyCFunction) _wrap_CalendarDateAttr_HasBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_IsHoliday", (PyCFunction) _wrap_CalendarDateAttr_IsHoliday, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetTextColour", (PyCFunction) _wrap_CalendarDateAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetBackgroundColour", (PyCFunction) _wrap_CalendarDateAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetBorderColour", (PyCFunction) _wrap_CalendarDateAttr_GetBorderColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetFont", (PyCFunction) _wrap_CalendarDateAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_GetBorder", (PyCFunction) _wrap_CalendarDateAttr_GetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarDateAttr_swigregister", CalendarDateAttr_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CalendarEvent", (PyCFunction) _wrap_new_CalendarEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_GetDate", (PyCFunction) _wrap_CalendarEvent_GetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_SetDate", (PyCFunction) _wrap_CalendarEvent_SetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_SetWeekDay", (PyCFunction) _wrap_CalendarEvent_SetWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_GetWeekDay", (PyCFunction) _wrap_CalendarEvent_GetWeekDay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarEvent_swigregister", CalendarEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_CalendarCtrl", (PyCFunction) _wrap_new_CalendarCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreCalendarCtrl", (PyCFunction) _wrap_new_PreCalendarCtrl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_Create", (PyCFunction) _wrap_CalendarCtrl_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetDate", (PyCFunction) _wrap_CalendarCtrl_SetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetDate", (PyCFunction) _wrap_CalendarCtrl_GetDate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetLowerDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_SetUpperDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetLowerDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetLowerDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetUpperDateLimit", (PyCFunction) _wrap_CalendarCtrl_GetUpperDateLimit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetDateRange", (PyCFunction) _wrap_CalendarCtrl_SetDateRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_EnableYearChange", (PyCFunction) _wrap_CalendarCtrl_EnableYearChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_EnableMonthChange", (PyCFunction) _wrap_CalendarCtrl_EnableMonthChange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_EnableHolidayDisplay", (PyCFunction) _wrap_CalendarCtrl_EnableHolidayDisplay, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHeaderColours", (PyCFunction) _wrap_CalendarCtrl_SetHeaderColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHeaderColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourFg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHeaderColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHeaderColourBg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHighlightColours", (PyCFunction) _wrap_CalendarCtrl_SetHighlightColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHighlightColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourFg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHighlightColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHighlightColourBg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHolidayColours", (PyCFunction) _wrap_CalendarCtrl_SetHolidayColours, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHolidayColourFg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourFg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetHolidayColourBg", (PyCFunction) _wrap_CalendarCtrl_GetHolidayColourBg, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetAttr", (PyCFunction) _wrap_CalendarCtrl_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetAttr", (PyCFunction) _wrap_CalendarCtrl_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_SetHoliday", (PyCFunction) _wrap_CalendarCtrl_SetHoliday, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_ResetAttr", (PyCFunction) _wrap_CalendarCtrl_ResetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_HitTest", (PyCFunction) _wrap_CalendarCtrl_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetMonthControl", (PyCFunction) _wrap_CalendarCtrl_GetMonthControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetYearControl", (PyCFunction) _wrap_CalendarCtrl_GetYearControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_GetClassDefaultAttributes", (PyCFunction) _wrap_CalendarCtrl_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"CalendarCtrl_swigregister", CalendarCtrl_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -2829,7 +2924,7 @@ _swigt__p_wxEvent,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -2855,22 +2950,22 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
-    PyDict_SetItemString(d,"CAL_SUNDAY_FIRST", SWIG_FromInt((int)wxCAL_SUNDAY_FIRST));
-    PyDict_SetItemString(d,"CAL_MONDAY_FIRST", SWIG_FromInt((int)wxCAL_MONDAY_FIRST));
-    PyDict_SetItemString(d,"CAL_SHOW_HOLIDAYS", SWIG_FromInt((int)wxCAL_SHOW_HOLIDAYS));
-    PyDict_SetItemString(d,"CAL_NO_YEAR_CHANGE", SWIG_FromInt((int)wxCAL_NO_YEAR_CHANGE));
-    PyDict_SetItemString(d,"CAL_NO_MONTH_CHANGE", SWIG_FromInt((int)wxCAL_NO_MONTH_CHANGE));
-    PyDict_SetItemString(d,"CAL_SEQUENTIAL_MONTH_SELECTION", SWIG_FromInt((int)wxCAL_SEQUENTIAL_MONTH_SELECTION));
-    PyDict_SetItemString(d,"CAL_SHOW_SURROUNDING_WEEKS", SWIG_FromInt((int)wxCAL_SHOW_SURROUNDING_WEEKS));
-    PyDict_SetItemString(d,"CAL_HITTEST_NOWHERE", SWIG_FromInt((int)wxCAL_HITTEST_NOWHERE));
-    PyDict_SetItemString(d,"CAL_HITTEST_HEADER", SWIG_FromInt((int)wxCAL_HITTEST_HEADER));
-    PyDict_SetItemString(d,"CAL_HITTEST_DAY", SWIG_FromInt((int)wxCAL_HITTEST_DAY));
-    PyDict_SetItemString(d,"CAL_HITTEST_INCMONTH", SWIG_FromInt((int)wxCAL_HITTEST_INCMONTH));
-    PyDict_SetItemString(d,"CAL_HITTEST_DECMONTH", SWIG_FromInt((int)wxCAL_HITTEST_DECMONTH));
-    PyDict_SetItemString(d,"CAL_HITTEST_SURROUNDING_WEEK", SWIG_FromInt((int)wxCAL_HITTEST_SURROUNDING_WEEK));
-    PyDict_SetItemString(d,"CAL_BORDER_NONE", SWIG_FromInt((int)wxCAL_BORDER_NONE));
-    PyDict_SetItemString(d,"CAL_BORDER_SQUARE", SWIG_FromInt((int)wxCAL_BORDER_SQUARE));
-    PyDict_SetItemString(d,"CAL_BORDER_ROUND", SWIG_FromInt((int)wxCAL_BORDER_ROUND));
+    PyDict_SetItemString(d,"CAL_SUNDAY_FIRST", SWIG_From_int((int)wxCAL_SUNDAY_FIRST));
+    PyDict_SetItemString(d,"CAL_MONDAY_FIRST", SWIG_From_int((int)wxCAL_MONDAY_FIRST));
+    PyDict_SetItemString(d,"CAL_SHOW_HOLIDAYS", SWIG_From_int((int)wxCAL_SHOW_HOLIDAYS));
+    PyDict_SetItemString(d,"CAL_NO_YEAR_CHANGE", SWIG_From_int((int)wxCAL_NO_YEAR_CHANGE));
+    PyDict_SetItemString(d,"CAL_NO_MONTH_CHANGE", SWIG_From_int((int)wxCAL_NO_MONTH_CHANGE));
+    PyDict_SetItemString(d,"CAL_SEQUENTIAL_MONTH_SELECTION", SWIG_From_int((int)wxCAL_SEQUENTIAL_MONTH_SELECTION));
+    PyDict_SetItemString(d,"CAL_SHOW_SURROUNDING_WEEKS", SWIG_From_int((int)wxCAL_SHOW_SURROUNDING_WEEKS));
+    PyDict_SetItemString(d,"CAL_HITTEST_NOWHERE", SWIG_From_int((int)wxCAL_HITTEST_NOWHERE));
+    PyDict_SetItemString(d,"CAL_HITTEST_HEADER", SWIG_From_int((int)wxCAL_HITTEST_HEADER));
+    PyDict_SetItemString(d,"CAL_HITTEST_DAY", SWIG_From_int((int)wxCAL_HITTEST_DAY));
+    PyDict_SetItemString(d,"CAL_HITTEST_INCMONTH", SWIG_From_int((int)wxCAL_HITTEST_INCMONTH));
+    PyDict_SetItemString(d,"CAL_HITTEST_DECMONTH", SWIG_From_int((int)wxCAL_HITTEST_DECMONTH));
+    PyDict_SetItemString(d,"CAL_HITTEST_SURROUNDING_WEEK", SWIG_From_int((int)wxCAL_HITTEST_SURROUNDING_WEEK));
+    PyDict_SetItemString(d,"CAL_BORDER_NONE", SWIG_From_int((int)wxCAL_BORDER_NONE));
+    PyDict_SetItemString(d,"CAL_BORDER_SQUARE", SWIG_From_int((int)wxCAL_BORDER_SQUARE));
+    PyDict_SetItemString(d,"CAL_BORDER_ROUND", SWIG_From_int((int)wxCAL_BORDER_ROUND));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_DOUBLECLICKED", PyInt_FromLong(wxEVT_CALENDAR_DOUBLECLICKED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_SEL_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_SEL_CHANGED));
     PyDict_SetItemString(d, "wxEVT_CALENDAR_DAY_CHANGED", PyInt_FromLong(wxEVT_CALENDAR_DAY_CHANGED));

diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp
index 2586a3bfd8f3449de92dc571649a91c3d5eec2f1..9053d750fea6ab7f8612e3f1291f62e440d6e515 100644 (file)
--- a/wxPython/src/mac/grid_wrap.cpp
+++ b/wxPython/src/mac/grid_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxGridCellAutoWrapStringRenderer swig_types[0] 
@@ -271,47 +273,64 @@ static swig_type_info *swig_types[54];
 
 #define SWIG_name    "_grid"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -768,18 +787,21 @@ wxPyMake_TEMPLATE(wxGridTableBase)
 SWIGSTATICINLINE(PyObject *)
 SWIG_FromCharPtr(const char* cptr)
 { 
-  size_t size = cptr ? strlen(cptr) : 0;
   if (cptr) {
+    size_t size = strlen(cptr);
     if (size > INT_MAX) {
-      return SWIG_NewPointerObj(swig_const_cast(char*,cptr), 
+      return SWIG_NewPointerObj(swig_const_cast(cptr,char*), 
                                SWIG_TypeQuery("char *"), 0);
     } else {
-      return PyString_FromStringAndSize(cptr, swig_numeric_cast(int,size));
+      if (size != 0) {
+       return PyString_FromStringAndSize(cptr, size);
+      } else {
+       return PyString_FromString(cptr);
+      }
     }
-  } else {
-    Py_INCREF(Py_None);
-    return Py_None;
   }
+  Py_INCREF(Py_None);
+  return Py_None;
 }
 
 
@@ -802,88 +824,144 @@ void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIGSTATICINLINE(int)
+SWIG_As_int(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
+  }
+  return v;
 }
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
     return 1;
   }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
@@ -1116,21 +1194,20 @@ void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){
                 self->SetClientObject(new wxPyOORClientData(_self));
         }
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -1142,36 +1219,47 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     return target;
 }
 
+
 void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){
             if (!self->GetClientObject())
                 self->SetClientObject(new wxPyOORClientData(_self));
         }
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
 {
-  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");
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
     }
-    return i;
-  }
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedLong(PyObject* obj)
+SWIGSTATICINLINE(unsigned long)
+SWIG_As_unsigned_SS_long(PyObject* obj)
 {
-  SWIG_AsUnsignedLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned long v;
+  if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_long(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0);
 }
 
 
@@ -1193,44 +1281,67 @@ void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){
                 self->SetClientObject(new wxPyOORClientData(_self));
         }
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
 }
 
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
+}
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckDouble(PyObject* obj)
+SWIGSTATICINLINE(double)
+SWIG_As_double(PyObject* obj)
 {
-  SWIG_AsDouble(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  double v;
+  if (!SWIG_AsVal_double(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(double));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_double(PyObject* obj)
+{
+  return SWIG_AsVal_double(obj, (double*)0);
 }
 
 
@@ -1441,6 +1552,7 @@ PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
 
 typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
 
+
 wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){
             wxGridCellCoords rv;
             self->XYToCell(x, y, rv);
@@ -1449,7 +1561,7 @@ wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_DateTimeFormatStr_set(PyObject *_val) {
+static int _wrap_DateTimeFormatStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable DateTimeFormatStr is read-only.");
     return 1;
 }
@@ -1469,7 +1581,7 @@ static PyObject *_wrap_DateTimeFormatStr_get() {
 }
 
 
-static int _wrap_GridNoCellCoords_set(PyObject *_val) {
+static int _wrap_GridNoCellCoords_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GridNoCellCoords is read-only.");
     return 1;
 }
@@ -1483,7 +1595,7 @@ static PyObject *_wrap_GridNoCellCoords_get() {
 }
 
 
-static int _wrap_GridNoCellRect_set(PyObject *_val) {
+static int _wrap_GridNoCellRect_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable GridNoCellRect is read-only.");
     return 1;
 }
@@ -1497,7 +1609,7 @@ static PyObject *_wrap_GridNoCellRect_get() {
 }
 
 
-static PyObject *_wrap_GridCellRenderer__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -1525,7 +1637,7 @@ static PyObject *_wrap_GridCellRenderer__setOORInfo(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellRenderer_SetParameters(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     wxString *arg2 = 0 ;
@@ -1566,7 +1678,7 @@ static PyObject *_wrap_GridCellRenderer_SetParameters(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridCellRenderer_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer_IncRef(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1591,7 +1703,7 @@ static PyObject *_wrap_GridCellRenderer_IncRef(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GridCellRenderer_DecRef(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer_DecRef(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1616,7 +1728,7 @@ static PyObject *_wrap_GridCellRenderer_DecRef(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     wxGrid *arg2 = 0 ;
@@ -1667,11 +1779,11 @@ static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyO
         arg5 = &temp5;
         if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
     }
-    arg6 = (int) SWIG_AsInt(obj5); 
+    arg6 = (int)SWIG_As_int(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg7 = (int) SWIG_AsInt(obj6); 
+    arg7 = (int)SWIG_As_int(obj6); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg8 = (bool) SWIG_AsBool(obj7); 
+    arg8 = (bool)SWIG_As_bool(obj7); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1687,7 +1799,7 @@ static PyObject *_wrap_GridCellRenderer_Draw(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     wxGrid *arg2 = 0 ;
@@ -1730,9 +1842,9 @@ static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *ar
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (int) SWIG_AsInt(obj5); 
+    arg6 = (int)SWIG_As_int(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1752,7 +1864,7 @@ static PyObject *_wrap_GridCellRenderer_GetBestSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellRenderer_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellRenderer_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellRenderer *arg1 = (wxGridCellRenderer *) 0 ;
     wxGridCellRenderer *result;
@@ -1780,14 +1892,14 @@ static PyObject *_wrap_GridCellRenderer_Clone(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * GridCellRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyGridCellRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyGridCellRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellRenderer *result;
     char *kwnames[] = {
@@ -1809,7 +1921,7 @@ static PyObject *_wrap_new_PyGridCellRenderer(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_PyGridCellRenderer__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellRenderer__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellRenderer *arg1 = (wxPyGridCellRenderer *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -1840,7 +1952,7 @@ static PyObject *_wrap_PyGridCellRenderer__setCallbackInfo(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellRenderer *arg1 = (wxPyGridCellRenderer *) 0 ;
     wxString *arg2 = 0 ;
@@ -1881,14 +1993,14 @@ static PyObject *_wrap_PyGridCellRenderer_base_SetParameters(PyObject *self, PyO
 }
 
 
-static PyObject * PyGridCellRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyGridCellRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyGridCellRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellStringRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellStringRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellStringRenderer *result;
     char *kwnames[] = {
@@ -1910,14 +2022,14 @@ static PyObject *_wrap_new_GridCellStringRenderer(PyObject *self, PyObject *args
 }
 
 
-static PyObject * GridCellStringRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellStringRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellStringRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellNumberRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellNumberRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellNumberRenderer *result;
     char *kwnames[] = {
@@ -1939,14 +2051,14 @@ static PyObject *_wrap_new_GridCellNumberRenderer(PyObject *self, PyObject *args
 }
 
 
-static PyObject * GridCellNumberRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellNumberRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellNumberRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellFloatRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellFloatRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) -1 ;
     int arg2 = (int) -1 ;
@@ -1959,11 +2071,11 @@ static PyObject *_wrap_new_GridCellFloatRenderer(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellFloatRenderer",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1980,7 +2092,7 @@ static PyObject *_wrap_new_GridCellFloatRenderer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellFloatRenderer_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellFloatRenderer_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ;
     int result;
@@ -1999,14 +2111,14 @@ static PyObject *_wrap_GridCellFloatRenderer_GetWidth(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellFloatRenderer_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellFloatRenderer_SetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ;
     int arg2 ;
@@ -2019,7 +2131,7 @@ static PyObject *_wrap_GridCellFloatRenderer_SetWidth(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellFloatRenderer_SetWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellFloatRenderer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2035,7 +2147,7 @@ static PyObject *_wrap_GridCellFloatRenderer_SetWidth(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridCellFloatRenderer_GetPrecision(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellFloatRenderer_GetPrecision(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ;
     int result;
@@ -2054,14 +2166,14 @@ static PyObject *_wrap_GridCellFloatRenderer_GetPrecision(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellFloatRenderer_SetPrecision(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellFloatRenderer_SetPrecision(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellFloatRenderer *arg1 = (wxGridCellFloatRenderer *) 0 ;
     int arg2 ;
@@ -2074,7 +2186,7 @@ static PyObject *_wrap_GridCellFloatRenderer_SetPrecision(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellFloatRenderer_SetPrecision",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellFloatRenderer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2090,14 +2202,14 @@ static PyObject *_wrap_GridCellFloatRenderer_SetPrecision(PyObject *self, PyObje
 }
 
 
-static PyObject * GridCellFloatRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellFloatRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellFloatRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellBoolRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellBoolRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellBoolRenderer *result;
     char *kwnames[] = {
@@ -2119,14 +2231,14 @@ static PyObject *_wrap_new_GridCellBoolRenderer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * GridCellBoolRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellBoolRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellBoolRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString arg1 = (wxString) wxPyDateTimeFormatStr ;
     wxString arg2 = (wxString) wxPyDateTimeFormatStr ;
@@ -2168,14 +2280,14 @@ static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * GridCellDateTimeRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellDateTimeRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellDateTimeRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellEnumRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellEnumRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -2216,14 +2328,14 @@ static PyObject *_wrap_new_GridCellEnumRenderer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * GridCellEnumRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellEnumRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellEnumRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellAutoWrapStringRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellAutoWrapStringRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAutoWrapStringRenderer *result;
     char *kwnames[] = {
@@ -2245,14 +2357,14 @@ static PyObject *_wrap_new_GridCellAutoWrapStringRenderer(PyObject *self, PyObje
 }
 
 
-static PyObject * GridCellAutoWrapStringRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellAutoWrapStringRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellAutoWrapStringRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_GridCellEditor__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2280,7 +2392,7 @@ static PyObject *_wrap_GridCellEditor__setOORInfo(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     bool result;
@@ -2308,7 +2420,7 @@ static PyObject *_wrap_GridCellEditor_IsCreated(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellEditor_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_GetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxControl *result;
@@ -2336,7 +2448,7 @@ static PyObject *_wrap_GridCellEditor_GetControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellEditor_SetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_SetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxControl *arg2 = (wxControl *) 0 ;
@@ -2365,7 +2477,7 @@ static PyObject *_wrap_GridCellEditor_SetControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxGridCellAttr *result;
@@ -2393,7 +2505,7 @@ static PyObject *_wrap_GridCellEditor_GetCellAttr(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellEditor_SetCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_SetCellAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -2422,7 +2534,7 @@ static PyObject *_wrap_GridCellEditor_SetCellAttr(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellEditor_SetParameters(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxString *arg2 = 0 ;
@@ -2463,7 +2575,7 @@ static PyObject *_wrap_GridCellEditor_SetParameters(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellEditor_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_IncRef(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2488,7 +2600,7 @@ static PyObject *_wrap_GridCellEditor_IncRef(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellEditor_DecRef(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_DecRef(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2513,7 +2625,7 @@ static PyObject *_wrap_GridCellEditor_DecRef(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellEditor_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -2532,7 +2644,7 @@ static PyObject *_wrap_GridCellEditor_Create(PyObject *self, PyObject *args, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxEvtHandler,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -2550,7 +2662,7 @@ static PyObject *_wrap_GridCellEditor_Create(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellEditor_BeginEdit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_BeginEdit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     int arg2 ;
@@ -2567,9 +2679,9 @@ static PyObject *_wrap_GridCellEditor_BeginEdit(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_BeginEdit",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellEditor,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -2587,7 +2699,7 @@ static PyObject *_wrap_GridCellEditor_BeginEdit(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     int arg2 ;
@@ -2605,9 +2717,9 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellEditor_EndEdit",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellEditor,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -2627,7 +2739,7 @@ static PyObject *_wrap_GridCellEditor_EndEdit(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellEditor_Reset(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_Reset(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2652,7 +2764,7 @@ static PyObject *_wrap_GridCellEditor_Reset(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellEditor_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxGridCellEditor *result;
@@ -2680,7 +2792,7 @@ static PyObject *_wrap_GridCellEditor_Clone(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellEditor_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxRect *arg2 = 0 ;
@@ -2712,7 +2824,7 @@ static PyObject *_wrap_GridCellEditor_SetSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellEditor_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     bool arg2 ;
@@ -2727,7 +2839,7 @@ static PyObject *_wrap_GridCellEditor_Show(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:GridCellEditor_Show",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellEditor,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGridCellAttr,
@@ -2747,7 +2859,7 @@ static PyObject *_wrap_GridCellEditor_Show(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GridCellEditor_PaintBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_PaintBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxRect *arg2 = 0 ;
@@ -2783,7 +2895,7 @@ static PyObject *_wrap_GridCellEditor_PaintBackground(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -2820,7 +2932,7 @@ static PyObject *_wrap_GridCellEditor_IsAcceptedKey(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellEditor_StartingKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_StartingKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -2854,7 +2966,7 @@ static PyObject *_wrap_GridCellEditor_StartingKey(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellEditor_StartingClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_StartingClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2879,7 +2991,7 @@ static PyObject *_wrap_GridCellEditor_StartingClick(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellEditor_HandleReturn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_HandleReturn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -2913,7 +3025,7 @@ static PyObject *_wrap_GridCellEditor_HandleReturn(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_GridCellEditor_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEditor_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEditor *arg1 = (wxGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -2938,14 +3050,14 @@ static PyObject *_wrap_GridCellEditor_Destroy(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * GridCellEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyGridCellEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyGridCellEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *result;
     char *kwnames[] = {
@@ -2967,7 +3079,7 @@ static PyObject *_wrap_new_PyGridCellEditor(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_PyGridCellEditor__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2998,7 +3110,7 @@ static PyObject *_wrap_PyGridCellEditor__setCallbackInfo(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxRect *arg2 = 0 ;
@@ -3030,7 +3142,7 @@ static PyObject *_wrap_PyGridCellEditor_base_SetSize(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     bool arg2 ;
@@ -3045,7 +3157,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyGridCellEditor_base_Show",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridCellEditor,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGridCellAttr,
@@ -3065,7 +3177,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Show(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxRect *arg2 = 0 ;
@@ -3101,7 +3213,7 @@ static PyObject *_wrap_PyGridCellEditor_base_PaintBackground(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -3138,7 +3250,7 @@ static PyObject *_wrap_PyGridCellEditor_base_IsAcceptedKey(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -3172,7 +3284,7 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingKey(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_StartingClick(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_StartingClick(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3197,7 +3309,7 @@ static PyObject *_wrap_PyGridCellEditor_base_StartingClick(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxKeyEvent *arg2 = 0 ;
@@ -3231,7 +3343,7 @@ static PyObject *_wrap_PyGridCellEditor_base_HandleReturn(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3256,7 +3368,7 @@ static PyObject *_wrap_PyGridCellEditor_base_Destroy(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellEditor *arg1 = (wxPyGridCellEditor *) 0 ;
     wxString *arg2 = 0 ;
@@ -3297,14 +3409,14 @@ static PyObject *_wrap_PyGridCellEditor_base_SetParameters(PyObject *self, PyObj
 }
 
 
-static PyObject * PyGridCellEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyGridCellEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyGridCellEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellTextEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellTextEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellTextEditor *result;
     char *kwnames[] = {
@@ -3326,7 +3438,7 @@ static PyObject *_wrap_new_GridCellTextEditor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellTextEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellTextEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellTextEditor *arg1 = (wxGridCellTextEditor *) 0 ;
     wxString result;
@@ -3358,14 +3470,14 @@ static PyObject *_wrap_GridCellTextEditor_GetValue(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * GridCellTextEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellTextEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellTextEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellNumberEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellNumberEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) -1 ;
     int arg2 = (int) -1 ;
@@ -3378,11 +3490,11 @@ static PyObject *_wrap_new_GridCellNumberEditor(PyObject *self, PyObject *args,
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellNumberEditor",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3399,7 +3511,7 @@ static PyObject *_wrap_new_GridCellNumberEditor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellNumberEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellNumberEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellNumberEditor *arg1 = (wxGridCellNumberEditor *) 0 ;
     wxString result;
@@ -3431,14 +3543,14 @@ static PyObject *_wrap_GridCellNumberEditor_GetValue(PyObject *self, PyObject *a
 }
 
 
-static PyObject * GridCellNumberEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellNumberEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellNumberEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellFloatEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellFloatEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) -1 ;
     int arg2 = (int) -1 ;
@@ -3451,11 +3563,11 @@ static PyObject *_wrap_new_GridCellFloatEditor(PyObject *self, PyObject *args, P
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellFloatEditor",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3472,7 +3584,7 @@ static PyObject *_wrap_new_GridCellFloatEditor(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GridCellFloatEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellFloatEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellFloatEditor *arg1 = (wxGridCellFloatEditor *) 0 ;
     wxString result;
@@ -3504,14 +3616,14 @@ static PyObject *_wrap_GridCellFloatEditor_GetValue(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * GridCellFloatEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellFloatEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellFloatEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellBoolEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellBoolEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellBoolEditor *result;
     char *kwnames[] = {
@@ -3533,7 +3645,7 @@ static PyObject *_wrap_new_GridCellBoolEditor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellBoolEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellBoolEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellBoolEditor *arg1 = (wxGridCellBoolEditor *) 0 ;
     wxString result;
@@ -3565,14 +3677,14 @@ static PyObject *_wrap_GridCellBoolEditor_GetValue(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * GridCellBoolEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellBoolEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellBoolEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     wxString *arg2 = (wxString *) NULL ;
@@ -3593,7 +3705,7 @@ static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *self, PyObject *args,
         }
     }
     if (obj1) {
-        arg3 = (bool) SWIG_AsBool(obj1); 
+        arg3 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -3616,7 +3728,7 @@ static PyObject *_wrap_new_GridCellChoiceEditor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellChoiceEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellChoiceEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellChoiceEditor *arg1 = (wxGridCellChoiceEditor *) 0 ;
     wxString result;
@@ -3648,14 +3760,14 @@ static PyObject *_wrap_GridCellChoiceEditor_GetValue(PyObject *self, PyObject *a
 }
 
 
-static PyObject * GridCellChoiceEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellChoiceEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellChoiceEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellEnumEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellEnumEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyEmptyString ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -3696,7 +3808,7 @@ static PyObject *_wrap_new_GridCellEnumEditor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellEnumEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellEnumEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellEnumEditor *arg1 = (wxGridCellEnumEditor *) 0 ;
     wxString result;
@@ -3728,14 +3840,14 @@ static PyObject *_wrap_GridCellEnumEditor_GetValue(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * GridCellEnumEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellEnumEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellEnumEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellAutoWrapStringEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellAutoWrapStringEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAutoWrapStringEditor *result;
     char *kwnames[] = {
@@ -3757,7 +3869,7 @@ static PyObject *_wrap_new_GridCellAutoWrapStringEditor(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAutoWrapStringEditor_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAutoWrapStringEditor_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAutoWrapStringEditor *arg1 = (wxGridCellAutoWrapStringEditor *) 0 ;
     wxString result;
@@ -3789,14 +3901,14 @@ static PyObject *_wrap_GridCellAutoWrapStringEditor_GetValue(PyObject *self, PyO
 }
 
 
-static PyObject * GridCellAutoWrapStringEditor_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellAutoWrapStringEditor_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellAutoWrapStringEditor, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_GridCellAttr__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -3824,7 +3936,7 @@ static PyObject *_wrap_GridCellAttr__setOORInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_new_GridCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) NULL ;
     wxGridCellAttr *result;
@@ -3854,7 +3966,7 @@ static PyObject *_wrap_new_GridCellAttr(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttr_Clone(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_Clone(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGridCellAttr *result;
@@ -3882,7 +3994,7 @@ static PyObject *_wrap_GridCellAttr_Clone(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_GridCellAttr_MergeWith(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_MergeWith(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -3911,7 +4023,7 @@ static PyObject *_wrap_GridCellAttr_MergeWith(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellAttr_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_IncRef(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3936,7 +4048,7 @@ static PyObject *_wrap_GridCellAttr_IncRef(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GridCellAttr_DecRef(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_DecRef(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3961,7 +4073,7 @@ static PyObject *_wrap_GridCellAttr_DecRef(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3993,7 +4105,7 @@ static PyObject *_wrap_GridCellAttr_SetTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxColour *arg2 = 0 ;
@@ -4025,7 +4137,7 @@ static PyObject *_wrap_GridCellAttr_SetBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxFont *arg2 = 0 ;
@@ -4059,7 +4171,7 @@ static PyObject *_wrap_GridCellAttr_SetFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     int arg2 ;
@@ -4074,9 +4186,9 @@ static PyObject *_wrap_GridCellAttr_SetAlignment(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttr_SetAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4092,7 +4204,7 @@ static PyObject *_wrap_GridCellAttr_SetAlignment(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     int arg2 ;
@@ -4107,9 +4219,9 @@ static PyObject *_wrap_GridCellAttr_SetSize(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttr_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4125,7 +4237,7 @@ static PyObject *_wrap_GridCellAttr_SetSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool arg2 = (bool) True ;
@@ -4139,7 +4251,7 @@ static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4156,7 +4268,7 @@ static PyObject *_wrap_GridCellAttr_SetOverflow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool arg2 = (bool) True ;
@@ -4170,7 +4282,7 @@ static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4187,7 +4299,7 @@ static PyObject *_wrap_GridCellAttr_SetReadOnly(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGridCellRenderer *arg2 = (wxGridCellRenderer *) 0 ;
@@ -4216,7 +4328,7 @@ static PyObject *_wrap_GridCellAttr_SetRenderer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGridCellEditor *arg2 = (wxGridCellEditor *) 0 ;
@@ -4245,7 +4357,7 @@ static PyObject *_wrap_GridCellAttr_SetEditor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     int arg2 ;
@@ -4258,7 +4370,7 @@ static PyObject *_wrap_GridCellAttr_SetKind(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellAttr_SetKind",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxGridCellAttr::wxAttrKind) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4274,7 +4386,7 @@ static PyObject *_wrap_GridCellAttr_SetKind(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4302,7 +4414,7 @@ static PyObject *_wrap_GridCellAttr_HasTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4330,7 +4442,7 @@ static PyObject *_wrap_GridCellAttr_HasBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4358,7 +4470,7 @@ static PyObject *_wrap_GridCellAttr_HasFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4386,7 +4498,7 @@ static PyObject *_wrap_GridCellAttr_HasAlignment(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4414,7 +4526,7 @@ static PyObject *_wrap_GridCellAttr_HasRenderer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4442,7 +4554,7 @@ static PyObject *_wrap_GridCellAttr_HasEditor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4470,7 +4582,7 @@ static PyObject *_wrap_GridCellAttr_HasReadWriteMode(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4498,7 +4610,7 @@ static PyObject *_wrap_GridCellAttr_HasOverflowMode(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxColour result;
@@ -4528,7 +4640,7 @@ static PyObject *_wrap_GridCellAttr_GetTextColour(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxColour result;
@@ -4558,7 +4670,7 @@ static PyObject *_wrap_GridCellAttr_GetBackgroundColour(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxFont result;
@@ -4588,20 +4700,22 @@ static PyObject *_wrap_GridCellAttr_GetFont(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellAttr_GetAlignment",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -4613,34 +4727,32 @@ static PyObject *_wrap_GridCellAttr_GetAlignment(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GridCellAttr_GetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -4652,21 +4764,17 @@ static PyObject *_wrap_GridCellAttr_GetSize(PyObject *self, PyObject *args, PyOb
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4694,7 +4802,7 @@ static PyObject *_wrap_GridCellAttr_GetOverflow(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGrid *arg2 = (wxGrid *) 0 ;
@@ -4714,9 +4822,9 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4734,7 +4842,7 @@ static PyObject *_wrap_GridCellAttr_GetRenderer(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGrid *arg2 = (wxGrid *) 0 ;
@@ -4754,9 +4862,9 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *self, PyObject *args, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4774,7 +4882,7 @@ static PyObject *_wrap_GridCellAttr_GetEditor(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     bool result;
@@ -4802,7 +4910,7 @@ static PyObject *_wrap_GridCellAttr_IsReadOnly(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GridCellAttr_GetKind(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_GetKind(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     int result;
@@ -4821,14 +4929,14 @@ static PyObject *_wrap_GridCellAttr_GetKind(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellAttr_SetDefAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttr_SetDefAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttr *arg1 = (wxGridCellAttr *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -4857,14 +4965,14 @@ static PyObject *_wrap_GridCellAttr_SetDefAttr(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject * GridCellAttr_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellAttr_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellAttr, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellAttrProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellAttrProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *result;
     char *kwnames[] = {
@@ -4888,7 +4996,7 @@ static PyObject *_wrap_new_GridCellAttrProvider(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -4916,7 +5024,7 @@ static PyObject *_wrap_GridCellAttrProvider__setOORInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     int arg2 ;
@@ -4934,11 +5042,11 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridCellAttrProvider_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttrProvider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxGridCellAttr::wxAttrKind) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4956,7 +5064,7 @@ static PyObject *_wrap_GridCellAttrProvider_GetAttr(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -4975,9 +5083,9 @@ static PyObject *_wrap_GridCellAttrProvider_SetAttr(PyObject *self, PyObject *ar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4993,7 +5101,7 @@ static PyObject *_wrap_GridCellAttrProvider_SetAttr(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider_SetRowAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -5010,7 +5118,7 @@ static PyObject *_wrap_GridCellAttrProvider_SetRowAttr(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5026,7 +5134,7 @@ static PyObject *_wrap_GridCellAttrProvider_SetRowAttr(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider_SetColAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -5043,7 +5151,7 @@ static PyObject *_wrap_GridCellAttrProvider_SetColAttr(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5059,7 +5167,7 @@ static PyObject *_wrap_GridCellAttrProvider_SetColAttr(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider_UpdateAttrRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider_UpdateAttrRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     size_t arg2 ;
@@ -5074,9 +5182,9 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrRows(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_UpdateAttrRows",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttrProvider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5092,7 +5200,7 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrRows(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_GridCellAttrProvider_UpdateAttrCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellAttrProvider_UpdateAttrCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellAttrProvider *arg1 = (wxGridCellAttrProvider *) 0 ;
     size_t arg2 ;
@@ -5107,9 +5215,9 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrCols(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellAttrProvider_UpdateAttrCols",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellAttrProvider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+    arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5125,14 +5233,14 @@ static PyObject *_wrap_GridCellAttrProvider_UpdateAttrCols(PyObject *self, PyObj
 }
 
 
-static PyObject * GridCellAttrProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellAttrProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellAttrProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyGridCellAttrProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyGridCellAttrProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellAttrProvider *result;
     char *kwnames[] = {
@@ -5154,7 +5262,7 @@ static PyObject *_wrap_new_PyGridCellAttrProvider(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyGridCellAttrProvider__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellAttrProvider__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -5185,7 +5293,7 @@ static PyObject *_wrap_PyGridCellAttrProvider__setCallbackInfo(PyObject *self, P
 }
 
 
-static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ;
     int arg2 ;
@@ -5203,11 +5311,11 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridCellAttrProvider_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridCellAttrProvider,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxGridCellAttr::wxAttrKind) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5225,7 +5333,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_GetAttr(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -5244,9 +5352,9 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *self, PyObj
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5262,7 +5370,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetAttr(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -5279,7 +5387,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5295,7 +5403,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetRowAttr(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridCellAttrProvider *arg1 = (wxPyGridCellAttrProvider *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -5312,7 +5420,7 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *self, Py
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5328,14 +5436,14 @@ static PyObject *_wrap_PyGridCellAttrProvider_base_SetColAttr(PyObject *self, Py
 }
 
 
-static PyObject * PyGridCellAttrProvider_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyGridCellAttrProvider_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyGridCellAttrProvider, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_GridTableBase__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase__setOORInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -5363,7 +5471,7 @@ static PyObject *_wrap_GridTableBase__setOORInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_SetAttrProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetAttrProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGridCellAttrProvider *arg2 = (wxGridCellAttrProvider *) 0 ;
@@ -5392,7 +5500,7 @@ static PyObject *_wrap_GridTableBase_SetAttrProvider(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGridCellAttrProvider *result;
@@ -5420,7 +5528,7 @@ static PyObject *_wrap_GridTableBase_GetAttrProvider(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridTableBase_SetView(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetView(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGrid *arg2 = (wxGrid *) 0 ;
@@ -5449,7 +5557,7 @@ static PyObject *_wrap_GridTableBase_SetView(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridTableBase_GetView(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetView(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGrid *result;
@@ -5477,7 +5585,7 @@ static PyObject *_wrap_GridTableBase_GetView(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridTableBase_GetNumberRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetNumberRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int result;
@@ -5496,14 +5604,14 @@ static PyObject *_wrap_GridTableBase_GetNumberRows(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridTableBase_GetNumberCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetNumberCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int result;
@@ -5522,14 +5630,14 @@ static PyObject *_wrap_GridTableBase_GetNumberCols(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5545,9 +5653,9 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_IsEmptyCell",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5565,7 +5673,7 @@ static PyObject *_wrap_GridTableBase_IsEmptyCell(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5581,9 +5689,9 @@ static PyObject *_wrap_GridTableBase_GetValue(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5605,7 +5713,7 @@ static PyObject *_wrap_GridTableBase_GetValue(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5623,9 +5731,9 @@ static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValue",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -5654,7 +5762,7 @@ static PyObject *_wrap_GridTableBase_SetValue(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridTableBase_GetTypeName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetTypeName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5670,9 +5778,9 @@ static PyObject *_wrap_GridTableBase_GetTypeName(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5694,7 +5802,7 @@ static PyObject *_wrap_GridTableBase_GetTypeName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5713,9 +5821,9 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -5746,7 +5854,7 @@ static PyObject *_wrap_GridTableBase_CanGetValueAs(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5765,9 +5873,9 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -5798,7 +5906,7 @@ static PyObject *_wrap_GridTableBase_CanSetValueAs(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5814,9 +5922,9 @@ static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsLong",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5825,14 +5933,14 @@ static PyObject *_wrap_GridTableBase_GetValueAsLong(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromLong((long)result);
+    resultobj = SWIG_From_long((long)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5848,9 +5956,9 @@ static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsDouble",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5859,14 +5967,14 @@ static PyObject *_wrap_GridTableBase_GetValueAsDouble(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromDouble((double)result);
+    resultobj = SWIG_From_double((double)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5882,9 +5990,9 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_GetValueAsBool",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5902,7 +6010,7 @@ static PyObject *_wrap_GridTableBase_GetValueAsBool(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridTableBase_SetValueAsLong(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetValueAsLong(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5919,11 +6027,11 @@ static PyObject *_wrap_GridTableBase_SetValueAsLong(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsLong",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (long) SWIG_AsLong(obj3); 
+    arg4 = (long)SWIG_As_long(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5939,7 +6047,7 @@ static PyObject *_wrap_GridTableBase_SetValueAsLong(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridTableBase_SetValueAsDouble(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetValueAsDouble(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5956,11 +6064,11 @@ static PyObject *_wrap_GridTableBase_SetValueAsDouble(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsDouble",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (double) SWIG_AsDouble(obj3); 
+    arg4 = (double)SWIG_As_double(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5976,7 +6084,7 @@ static PyObject *_wrap_GridTableBase_SetValueAsDouble(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridTableBase_SetValueAsBool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetValueAsBool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -5993,11 +6101,11 @@ static PyObject *_wrap_GridTableBase_SetValueAsBool(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_SetValueAsBool",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (bool) SWIG_AsBool(obj3); 
+    arg4 = (bool)SWIG_As_bool(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6013,7 +6121,7 @@ static PyObject *_wrap_GridTableBase_SetValueAsBool(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_GridTableBase_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6038,7 +6146,7 @@ static PyObject *_wrap_GridTableBase_Clear(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_InsertRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6055,11 +6163,11 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6078,7 +6186,7 @@ static PyObject *_wrap_GridTableBase_InsertRows(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_AppendRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     size_t arg2 = (size_t) 1 ;
@@ -6093,7 +6201,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6112,7 +6220,7 @@ static PyObject *_wrap_GridTableBase_AppendRows(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6129,11 +6237,11 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6152,7 +6260,7 @@ static PyObject *_wrap_GridTableBase_DeleteRows(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_InsertCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6169,11 +6277,11 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6192,7 +6300,7 @@ static PyObject *_wrap_GridTableBase_InsertCols(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_AppendCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     size_t arg2 = (size_t) 1 ;
@@ -6207,7 +6315,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6226,7 +6334,7 @@ static PyObject *_wrap_GridTableBase_AppendCols(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6243,11 +6351,11 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6266,7 +6374,7 @@ static PyObject *_wrap_GridTableBase_DeleteCols(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_GetRowLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -6280,7 +6388,7 @@ static PyObject *_wrap_GridTableBase_GetRowLabelValue(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableBase_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6302,7 +6410,7 @@ static PyObject *_wrap_GridTableBase_GetRowLabelValue(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridTableBase_GetColLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -6316,7 +6424,7 @@ static PyObject *_wrap_GridTableBase_GetColLabelValue(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableBase_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6338,7 +6446,7 @@ static PyObject *_wrap_GridTableBase_GetColLabelValue(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -6354,7 +6462,7 @@ static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -6383,7 +6491,7 @@ static PyObject *_wrap_GridTableBase_SetRowLabelValue(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -6399,7 +6507,7 @@ static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridTableBase_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -6428,7 +6536,7 @@ static PyObject *_wrap_GridTableBase_SetColLabelValue(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     bool result;
@@ -6456,7 +6564,7 @@ static PyObject *_wrap_GridTableBase_CanHaveAttributes(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridTableBase_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -6474,11 +6582,11 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GridTableBase_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxGridCellAttr::wxAttrKind) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6496,7 +6604,7 @@ static PyObject *_wrap_GridTableBase_GetAttr(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridTableBase_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -6515,9 +6623,9 @@ static PyObject *_wrap_GridTableBase_SetAttr(PyObject *self, PyObject *args, PyO
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6533,7 +6641,7 @@ static PyObject *_wrap_GridTableBase_SetAttr(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridTableBase_SetRowAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -6550,7 +6658,7 @@ static PyObject *_wrap_GridTableBase_SetRowAttr(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6566,7 +6674,7 @@ static PyObject *_wrap_GridTableBase_SetRowAttr(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridTableBase_SetColAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableBase_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -6583,7 +6691,7 @@ static PyObject *_wrap_GridTableBase_SetColAttr(PyObject *self, PyObject *args,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6599,14 +6707,14 @@ static PyObject *_wrap_GridTableBase_SetColAttr(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * GridTableBase_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridTableBase_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridTableBase, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyGridTableBase(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyGridTableBase(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *result;
     char *kwnames[] = {
@@ -6628,7 +6736,7 @@ static PyObject *_wrap_new_PyGridTableBase(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyGridTableBase__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -6659,7 +6767,7 @@ static PyObject *_wrap_PyGridTableBase__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_Destroy(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6684,7 +6792,7 @@ static PyObject *_wrap_PyGridTableBase_Destroy(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -6700,9 +6808,9 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_GetTypeName",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6724,7 +6832,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetTypeName(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -6743,9 +6851,9 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanGetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -6776,7 +6884,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanGetValueAs(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -6795,9 +6903,9 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_CanSetValueAs",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -6828,7 +6936,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanSetValueAs(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_Clear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6853,7 +6961,7 @@ static PyObject *_wrap_PyGridTableBase_base_Clear(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6870,11 +6978,11 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6893,7 +7001,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertRows(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     size_t arg2 = (size_t) 1 ;
@@ -6908,7 +7016,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6927,7 +7035,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendRows(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6944,11 +7052,11 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6967,7 +7075,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteRows(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -6984,11 +7092,11 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7007,7 +7115,7 @@ static PyObject *_wrap_PyGridTableBase_base_InsertCols(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     size_t arg2 = (size_t) 1 ;
@@ -7022,7 +7130,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7041,7 +7149,7 @@ static PyObject *_wrap_PyGridTableBase_base_AppendCols(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     size_t arg2 = (size_t) 0 ;
@@ -7058,11 +7166,11 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (size_t) SWIG_AsUnsignedLong(obj1); 
+        arg2 = (size_t)SWIG_As_unsigned_SS_long(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (size_t) SWIG_AsUnsignedLong(obj2); 
+        arg3 = (size_t)SWIG_As_unsigned_SS_long(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7081,7 +7189,7 @@ static PyObject *_wrap_PyGridTableBase_base_DeleteCols(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -7095,7 +7203,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7117,7 +7225,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetRowLabelValue(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -7131,7 +7239,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyGridTableBase_base_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7153,7 +7261,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetColLabelValue(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -7169,7 +7277,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -7198,7 +7306,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowLabelValue(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -7214,7 +7322,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyGridTableBase_base_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -7243,7 +7351,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColLabelValue(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     bool result;
@@ -7271,7 +7379,7 @@ static PyObject *_wrap_PyGridTableBase_base_CanHaveAttributes(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     int arg2 ;
@@ -7289,11 +7397,11 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyGridTableBase_base_GetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (wxGridCellAttr::wxAttrKind) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7311,7 +7419,7 @@ static PyObject *_wrap_PyGridTableBase_base_GetAttr(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -7330,9 +7438,9 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *self, PyObject *ar
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7348,7 +7456,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetAttr(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -7365,7 +7473,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7381,7 +7489,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetRowAttr(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyGridTableBase *arg1 = (wxPyGridTableBase *) 0 ;
     wxGridCellAttr *arg2 = (wxGridCellAttr *) 0 ;
@@ -7398,7 +7506,7 @@ static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7414,14 +7522,14 @@ static PyObject *_wrap_PyGridTableBase_base_SetColAttr(PyObject *self, PyObject
 }
 
 
-static PyObject * PyGridTableBase_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyGridTableBase_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyGridTableBase, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridStringTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridStringTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) 0 ;
     int arg2 = (int) 0 ;
@@ -7434,11 +7542,11 @@ static PyObject *_wrap_new_GridStringTable(PyObject *self, PyObject *args, PyObj
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridStringTable",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7455,14 +7563,14 @@ static PyObject *_wrap_new_GridStringTable(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * GridStringTable_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridStringTable_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridStringTable, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridTableMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridTableMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
     int arg2 ;
@@ -7480,14 +7588,14 @@ static PyObject *_wrap_new_GridTableMessage(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:new_GridTableMessage",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7504,7 +7612,7 @@ static PyObject *_wrap_new_GridTableMessage(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_GridTableMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_GridTableMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7529,7 +7637,7 @@ static PyObject *_wrap_delete_GridTableMessage(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GridTableMessage_SetTableObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_SetTableObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     wxGridTableBase *arg2 = (wxGridTableBase *) 0 ;
@@ -7558,7 +7666,7 @@ static PyObject *_wrap_GridTableMessage_SetTableObject(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     wxGridTableBase *result;
@@ -7586,7 +7694,7 @@ static PyObject *_wrap_GridTableMessage_GetTableObject(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridTableMessage_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     int arg2 ;
@@ -7599,7 +7707,7 @@ static PyObject *_wrap_GridTableMessage_SetId(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetId",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableMessage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7615,7 +7723,7 @@ static PyObject *_wrap_GridTableMessage_SetId(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridTableMessage_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     int result;
@@ -7634,14 +7742,14 @@ static PyObject *_wrap_GridTableMessage_GetId(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridTableMessage_SetCommandInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_SetCommandInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     int arg2 ;
@@ -7654,7 +7762,7 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetCommandInt",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableMessage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7670,7 +7778,7 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridTableMessage_GetCommandInt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_GetCommandInt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     int result;
@@ -7689,14 +7797,14 @@ static PyObject *_wrap_GridTableMessage_GetCommandInt(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridTableMessage_SetCommandInt2(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_SetCommandInt2(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     int arg2 ;
@@ -7709,7 +7817,7 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt2(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridTableMessage_SetCommandInt2",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridTableMessage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7725,7 +7833,7 @@ static PyObject *_wrap_GridTableMessage_SetCommandInt2(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridTableMessage_GetCommandInt2(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridTableMessage_GetCommandInt2(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridTableMessage *arg1 = (wxGridTableMessage *) 0 ;
     int result;
@@ -7744,21 +7852,21 @@ static PyObject *_wrap_GridTableMessage_GetCommandInt2(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * GridTableMessage_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridTableMessage_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridTableMessage, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridCellCoords(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridCellCoords(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) -1 ;
     int arg2 = (int) -1 ;
@@ -7771,11 +7879,11 @@ static PyObject *_wrap_new_GridCellCoords(PyObject *self, PyObject *args, PyObje
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_GridCellCoords",kwnames,&obj0,&obj1)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7792,7 +7900,7 @@ static PyObject *_wrap_new_GridCellCoords(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_GridCellCoords(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_GridCellCoords(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7817,7 +7925,7 @@ static PyObject *_wrap_delete_GridCellCoords(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellCoords_GetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords_GetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     int result;
@@ -7836,14 +7944,14 @@ static PyObject *_wrap_GridCellCoords_GetRow(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellCoords_SetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords_SetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     int arg2 ;
@@ -7856,7 +7964,7 @@ static PyObject *_wrap_GridCellCoords_SetRow(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords_SetRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellCoords,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7872,7 +7980,7 @@ static PyObject *_wrap_GridCellCoords_SetRow(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellCoords_GetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords_GetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     int result;
@@ -7891,14 +7999,14 @@ static PyObject *_wrap_GridCellCoords_GetCol(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridCellCoords_SetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords_SetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     int arg2 ;
@@ -7911,7 +8019,7 @@ static PyObject *_wrap_GridCellCoords_SetCol(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords_SetCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellCoords,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7927,7 +8035,7 @@ static PyObject *_wrap_GridCellCoords_SetCol(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellCoords_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     int arg2 ;
@@ -7942,9 +8050,9 @@ static PyObject *_wrap_GridCellCoords_Set(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GridCellCoords_Set",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridCellCoords,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7960,7 +8068,7 @@ static PyObject *_wrap_GridCellCoords_Set(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords___eq__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     wxGridCellCoords *arg2 = 0 ;
@@ -7995,7 +8103,7 @@ static PyObject *_wrap_GridCellCoords___eq__(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords___ne__(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     wxGridCellCoords *arg2 = 0 ;
@@ -8030,7 +8138,7 @@ static PyObject *_wrap_GridCellCoords___ne__(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridCellCoords_Get(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridCellCoords_Get(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
     PyObject *result;
@@ -8056,14 +8164,14 @@ static PyObject *_wrap_GridCellCoords_Get(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * GridCellCoords_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridCellCoords_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridCellCoords, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Grid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -8092,7 +8200,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -8108,7 +8216,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
         }
     }
     if (obj4) {
-        arg5 = (long) SWIG_AsLong(obj4); 
+        arg5 = (long)SWIG_As_long(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -8141,7 +8249,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
 }
 
 
-static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *result;
     char *kwnames[] = {
@@ -8164,7 +8272,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Grid_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -8197,7 +8305,7 @@ static PyObject *_wrap_Grid_Create(PyObject *self, PyObject *args, PyObject *kwa
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -8213,7 +8321,7 @@ static PyObject *_wrap_Grid_Create(PyObject *self, PyObject *args, PyObject *kwa
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -8247,7 +8355,7 @@ static PyObject *_wrap_Grid_Create(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CreateGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -8265,12 +8373,12 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_CreateGrid",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (WXGRIDSELECTIONMODES) SWIG_AsInt(obj3); 
+        arg4 = (WXGRIDSELECTIONMODES)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8289,7 +8397,7 @@ static PyObject *_wrap_Grid_CreateGrid(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetSelectionMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetSelectionMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     WXGRIDSELECTIONMODES arg2 ;
@@ -8302,7 +8410,7 @@ static PyObject *_wrap_Grid_SetSelectionMode(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetSelectionMode",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (WXGRIDSELECTIONMODES) SWIG_AsInt(obj1); 
+    arg2 = (WXGRIDSELECTIONMODES)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8318,7 +8426,7 @@ static PyObject *_wrap_Grid_SetSelectionMode(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetSelectionMode(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectionMode(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     WXGRIDSELECTIONMODES result;
@@ -8337,14 +8445,14 @@ static PyObject *_wrap_Grid_GetSelectionMode(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetNumberRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetNumberRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -8363,14 +8471,14 @@ static PyObject *_wrap_Grid_GetNumberRows(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetNumberCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetNumberCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -8389,14 +8497,14 @@ static PyObject *_wrap_Grid_GetNumberCols(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridTableMessage *arg2 = 0 ;
@@ -8433,7 +8541,7 @@ static PyObject *_wrap_Grid_ProcessTableMessage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_GetTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridTableBase *result;
@@ -8461,7 +8569,7 @@ static PyObject *_wrap_Grid_GetTable(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetTable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridTableBase *arg2 = (wxGridTableBase *) 0 ;
@@ -8482,11 +8590,11 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxGridTableBase,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (WXGRIDSELECTIONMODES) SWIG_AsInt(obj3); 
+        arg4 = (WXGRIDSELECTIONMODES)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8505,7 +8613,7 @@ static PyObject *_wrap_Grid_SetTable(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Grid_ClearGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_ClearGrid(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8530,7 +8638,7 @@ static PyObject *_wrap_Grid_ClearGrid(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_InsertRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
@@ -8549,15 +8657,15 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8576,7 +8684,7 @@ static PyObject *_wrap_Grid_InsertRows(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AppendRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 1 ;
@@ -8593,11 +8701,11 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8616,7 +8724,7 @@ static PyObject *_wrap_Grid_AppendRows(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DeleteRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
@@ -8635,15 +8743,15 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8662,7 +8770,7 @@ static PyObject *_wrap_Grid_DeleteRows(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_InsertCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
@@ -8681,15 +8789,15 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8708,7 +8816,7 @@ static PyObject *_wrap_Grid_InsertCols(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AppendCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 1 ;
@@ -8725,11 +8833,11 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8748,7 +8856,7 @@ static PyObject *_wrap_Grid_AppendCols(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DeleteCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 = (int) 0 ;
@@ -8767,15 +8875,15 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8794,7 +8902,7 @@ static PyObject *_wrap_Grid_DeleteCols(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_DrawCellHighlight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DrawCellHighlight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8832,7 +8940,7 @@ static PyObject *_wrap_Grid_DrawCellHighlight(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8874,15 +8982,15 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py
         if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8907,7 +9015,7 @@ static PyObject *_wrap_Grid_DrawTextRectangle(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxDC *arg2 = 0 ;
@@ -8916,7 +9024,9 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
     long *arg5 = (long *) 0 ;
     bool temp3 = False ;
     long temp4 ;
+    int res4 = 0 ;
     long temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -8924,8 +9034,8 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
         (char *) "self",(char *) "dc",(char *) "lines", NULL 
     };
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetTextBoxSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -8965,14 +9075,10 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_long, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_long((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_long, 0)));
     {
         if (temp3) delete arg3;
     }
@@ -8985,7 +9091,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_BeginBatch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_BeginBatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9010,7 +9116,7 @@ static PyObject *_wrap_Grid_BeginBatch(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_EndBatch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EndBatch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9035,7 +9141,7 @@ static PyObject *_wrap_Grid_EndBatch(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Grid_GetBatchCount(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetBatchCount(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -9054,14 +9160,14 @@ static PyObject *_wrap_Grid_GetBatchCount(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_ForceRefresh(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_ForceRefresh(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9086,7 +9192,7 @@ static PyObject *_wrap_Grid_ForceRefresh(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsEditable(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9114,7 +9220,7 @@ static PyObject *_wrap_Grid_IsEditable(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_EnableEditing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableEditing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9127,7 +9233,7 @@ static PyObject *_wrap_Grid_EnableEditing(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_EnableEditing",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9143,7 +9249,7 @@ static PyObject *_wrap_Grid_EnableEditing(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -9157,7 +9263,7 @@ static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *self, PyObject *args
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9174,7 +9280,7 @@ static PyObject *_wrap_Grid_EnableCellEditControl(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Grid_DisableCellEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DisableCellEditControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9199,7 +9305,7 @@ static PyObject *_wrap_Grid_DisableCellEditControl(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_CanEnableCellControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CanEnableCellControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9227,7 +9333,7 @@ static PyObject *_wrap_Grid_CanEnableCellControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_IsCellEditControlEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsCellEditControlEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9255,7 +9361,7 @@ static PyObject *_wrap_Grid_IsCellEditControlEnabled(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_IsCellEditControlShown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsCellEditControlShown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9283,7 +9389,7 @@ static PyObject *_wrap_Grid_IsCellEditControlShown(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_IsCurrentCellReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsCurrentCellReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9311,7 +9417,7 @@ static PyObject *_wrap_Grid_IsCurrentCellReadOnly(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Grid_ShowCellEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_ShowCellEditControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9336,7 +9442,7 @@ static PyObject *_wrap_Grid_ShowCellEditControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_HideCellEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_HideCellEditControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9361,7 +9467,7 @@ static PyObject *_wrap_Grid_HideCellEditControl(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_SaveEditControlValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SaveEditControlValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9386,7 +9492,7 @@ static PyObject *_wrap_Grid_SaveEditControlValue(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_XYToCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_XYToCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9402,9 +9508,9 @@ static PyObject *_wrap_Grid_XYToCell(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_XYToCell",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9424,7 +9530,7 @@ static PyObject *_wrap_Grid_XYToCell(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_YToRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9438,7 +9544,7 @@ static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_YToRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9447,14 +9553,14 @@ static PyObject *_wrap_Grid_YToRow(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_XToCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9468,7 +9574,7 @@ static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwa
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_XToCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9477,14 +9583,14 @@ static PyObject *_wrap_Grid_XToCol(PyObject *self, PyObject *args, PyObject *kwa
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9498,7 +9604,7 @@ static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_YToEdgeOfRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9507,14 +9613,14 @@ static PyObject *_wrap_Grid_YToEdgeOfRow(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9528,7 +9634,7 @@ static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_XToEdgeOfCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9537,14 +9643,14 @@ static PyObject *_wrap_Grid_XToEdgeOfCol(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_CellToRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CellToRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9560,9 +9666,9 @@ static PyObject *_wrap_Grid_CellToRect(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_CellToRect",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9582,7 +9688,7 @@ static PyObject *_wrap_Grid_CellToRect(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_GetGridCursorRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridCursorRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -9601,14 +9707,14 @@ static PyObject *_wrap_Grid_GetGridCursorRow(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetGridCursorCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridCursorCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -9627,14 +9733,14 @@ static PyObject *_wrap_Grid_GetGridCursorCol(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9652,12 +9758,12 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_IsVisible",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -9676,7 +9782,7 @@ static PyObject *_wrap_Grid_IsVisible(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_MakeCellVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MakeCellVisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9691,9 +9797,9 @@ static PyObject *_wrap_Grid_MakeCellVisible(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_MakeCellVisible",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9709,7 +9815,7 @@ static PyObject *_wrap_Grid_MakeCellVisible(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_SetGridCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetGridCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -9724,9 +9830,9 @@ static PyObject *_wrap_Grid_SetGridCursor(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetGridCursor",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9742,7 +9848,7 @@ static PyObject *_wrap_Grid_SetGridCursor(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9756,7 +9862,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorUp",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9774,7 +9880,7 @@ static PyObject *_wrap_Grid_MoveCursorUp(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9788,7 +9894,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorDown",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9806,7 +9912,7 @@ static PyObject *_wrap_Grid_MoveCursorDown(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9820,7 +9926,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorLeft",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9838,7 +9944,7 @@ static PyObject *_wrap_Grid_MoveCursorLeft(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9852,7 +9958,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorRight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9870,7 +9976,7 @@ static PyObject *_wrap_Grid_MoveCursorRight(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_MovePageDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MovePageDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9898,7 +10004,7 @@ static PyObject *_wrap_Grid_MovePageDown(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_MovePageUp(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MovePageUp(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -9926,7 +10032,7 @@ static PyObject *_wrap_Grid_MovePageUp(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9940,7 +10046,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorUpBlock",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9958,7 +10064,7 @@ static PyObject *_wrap_Grid_MoveCursorUpBlock(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -9972,7 +10078,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorDownBlock",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9990,7 +10096,7 @@ static PyObject *_wrap_Grid_MoveCursorDownBlock(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -10004,7 +10110,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorLeftBlock",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10022,7 +10128,7 @@ static PyObject *_wrap_Grid_MoveCursorLeftBlock(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -10036,7 +10142,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_MoveCursorRightBlock",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10054,7 +10160,7 @@ static PyObject *_wrap_Grid_MoveCursorRightBlock(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultRowLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10073,14 +10179,14 @@ static PyObject *_wrap_Grid_GetDefaultRowLabelSize(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetRowLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10099,14 +10205,14 @@ static PyObject *_wrap_Grid_GetRowLabelSize(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultColLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultColLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10125,14 +10231,14 @@ static PyObject *_wrap_Grid_GetDefaultColLabelSize(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetColLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetColLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10151,14 +10257,14 @@ static PyObject *_wrap_Grid_GetColLabelSize(PyObject *self, PyObject *args, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetLabelBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetLabelBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -10188,7 +10294,7 @@ static PyObject *_wrap_Grid_GetLabelBackgroundColour(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_GetLabelTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetLabelTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -10218,7 +10324,7 @@ static PyObject *_wrap_Grid_GetLabelTextColour(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_GetLabelFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetLabelFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxFont result;
@@ -10248,20 +10354,22 @@ static PyObject *_wrap_Grid_GetLabelFont(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_GetRowLabelAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetRowLabelAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_GetRowLabelAlignment",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -10273,34 +10381,32 @@ static PyObject *_wrap_Grid_GetRowLabelAlignment(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetColLabelAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetColLabelAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_GetColLabelAlignment",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -10312,21 +10418,17 @@ static PyObject *_wrap_Grid_GetColLabelAlignment(PyObject *self, PyObject *args,
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetColLabelTextOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetColLabelTextOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10345,14 +10447,14 @@ static PyObject *_wrap_Grid_GetColLabelTextOrientation(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetRowLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10366,7 +10468,7 @@ static PyObject *_wrap_Grid_GetRowLabelValue(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetRowLabelValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10388,7 +10490,7 @@ static PyObject *_wrap_Grid_GetRowLabelValue(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetColLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10402,7 +10504,7 @@ static PyObject *_wrap_Grid_GetColLabelValue(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetColLabelValue",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10424,7 +10526,7 @@ static PyObject *_wrap_Grid_GetColLabelValue(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetGridLineColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridLineColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -10454,7 +10556,7 @@ static PyObject *_wrap_Grid_GetGridLineColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_GetCellHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellHighlightColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -10484,7 +10586,7 @@ static PyObject *_wrap_Grid_GetCellHighlightColour(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_GetCellHighlightPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellHighlightPenWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10503,14 +10605,14 @@ static PyObject *_wrap_Grid_GetCellHighlightPenWidth(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetCellHighlightROPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellHighlightROPenWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -10529,14 +10631,14 @@ static PyObject *_wrap_Grid_GetCellHighlightROPenWidth(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_SetRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10549,7 +10651,7 @@ static PyObject *_wrap_Grid_SetRowLabelSize(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetRowLabelSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10565,7 +10667,7 @@ static PyObject *_wrap_Grid_SetRowLabelSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_SetColLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10578,7 +10680,7 @@ static PyObject *_wrap_Grid_SetColLabelSize(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColLabelSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10594,7 +10696,7 @@ static PyObject *_wrap_Grid_SetColLabelSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_SetLabelBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetLabelBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10626,7 +10728,7 @@ static PyObject *_wrap_Grid_SetLabelBackgroundColour(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_SetLabelTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetLabelTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10658,7 +10760,7 @@ static PyObject *_wrap_Grid_SetLabelTextColour(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_SetLabelFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetLabelFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxFont *arg2 = 0 ;
@@ -10692,7 +10794,7 @@ static PyObject *_wrap_Grid_SetLabelFont(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_SetRowLabelAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowLabelAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10707,9 +10809,9 @@ static PyObject *_wrap_Grid_SetRowLabelAlignment(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowLabelAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10725,7 +10827,7 @@ static PyObject *_wrap_Grid_SetRowLabelAlignment(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_SetColLabelAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColLabelAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10740,9 +10842,9 @@ static PyObject *_wrap_Grid_SetColLabelAlignment(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColLabelAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10758,7 +10860,7 @@ static PyObject *_wrap_Grid_SetColLabelAlignment(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_SetColLabelTextOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColLabelTextOrientation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10771,7 +10873,7 @@ static PyObject *_wrap_Grid_SetColLabelTextOrientation(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColLabelTextOrientation",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10787,7 +10889,7 @@ static PyObject *_wrap_Grid_SetColLabelTextOrientation(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10803,7 +10905,7 @@ static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -10832,7 +10934,7 @@ static PyObject *_wrap_Grid_SetRowLabelValue(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColLabelValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10848,7 +10950,7 @@ static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColLabelValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -10877,7 +10979,7 @@ static PyObject *_wrap_Grid_SetColLabelValue(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_SetGridLineColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetGridLineColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10909,7 +11011,7 @@ static PyObject *_wrap_Grid_SetGridLineColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_SetCellHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellHighlightColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -10941,7 +11043,7 @@ static PyObject *_wrap_Grid_SetCellHighlightColour(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_SetCellHighlightPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellHighlightPenWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10954,7 +11056,7 @@ static PyObject *_wrap_Grid_SetCellHighlightPenWidth(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetCellHighlightPenWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10970,7 +11072,7 @@ static PyObject *_wrap_Grid_SetCellHighlightPenWidth(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -10983,7 +11085,7 @@ static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetCellHighlightROPenWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10999,7 +11101,7 @@ static PyObject *_wrap_Grid_SetCellHighlightROPenWidth(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -11013,7 +11115,7 @@ static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11030,7 +11132,7 @@ static PyObject *_wrap_Grid_EnableDragRowSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_DisableDragRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DisableDragRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11055,7 +11157,7 @@ static PyObject *_wrap_Grid_DisableDragRowSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_CanDragRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CanDragRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -11083,7 +11185,7 @@ static PyObject *_wrap_Grid_CanDragRowSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_EnableDragColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableDragColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -11097,7 +11199,7 @@ static PyObject *_wrap_Grid_EnableDragColSize(PyObject *self, PyObject *args, Py
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11114,7 +11216,7 @@ static PyObject *_wrap_Grid_EnableDragColSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_DisableDragColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DisableDragColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11139,7 +11241,7 @@ static PyObject *_wrap_Grid_DisableDragColSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_CanDragColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CanDragColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -11167,7 +11269,7 @@ static PyObject *_wrap_Grid_CanDragColSize(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -11181,7 +11283,7 @@ static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11198,7 +11300,7 @@ static PyObject *_wrap_Grid_EnableDragGridSize(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_DisableDragGridSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DisableDragGridSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11223,7 +11325,7 @@ static PyObject *_wrap_Grid_DisableDragGridSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CanDragGridSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -11251,7 +11353,7 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_EnableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableDragCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -11265,7 +11367,7 @@ static PyObject *_wrap_Grid_EnableDragCell(PyObject *self, PyObject *args, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11282,7 +11384,7 @@ static PyObject *_wrap_Grid_EnableDragCell(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_DisableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DisableDragCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -11307,7 +11409,7 @@ static PyObject *_wrap_Grid_DisableDragCell(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_CanDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_CanDragCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -11335,7 +11437,7 @@ static PyObject *_wrap_Grid_CanDragCell(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11352,9 +11454,9 @@ static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kw
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetAttr",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -11372,7 +11474,7 @@ static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_Grid_SetRowAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11387,7 +11489,7 @@ static PyObject *_wrap_Grid_SetRowAttr(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowAttr",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -11405,7 +11507,7 @@ static PyObject *_wrap_Grid_SetRowAttr(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetColAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11420,7 +11522,7 @@ static PyObject *_wrap_Grid_SetColAttr(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColAttr",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGridCellAttr,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -11438,7 +11540,7 @@ static PyObject *_wrap_Grid_SetColAttr(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11454,9 +11556,9 @@ static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetOrCreateCellAttr",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11474,7 +11576,7 @@ static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_SetColFormatBool(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColFormatBool(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11487,7 +11589,7 @@ static PyObject *_wrap_Grid_SetColFormatBool(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColFormatBool",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11503,7 +11605,7 @@ static PyObject *_wrap_Grid_SetColFormatBool(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_SetColFormatNumber(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColFormatNumber(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11516,7 +11618,7 @@ static PyObject *_wrap_Grid_SetColFormatNumber(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColFormatNumber",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11532,7 +11634,7 @@ static PyObject *_wrap_Grid_SetColFormatNumber(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_SetColFormatFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColFormatFloat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11549,14 +11651,14 @@ static PyObject *_wrap_Grid_SetColFormatFloat(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OO:Grid_SetColFormatFloat",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11573,7 +11675,7 @@ static PyObject *_wrap_Grid_SetColFormatFloat(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11589,7 +11691,7 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColFormatCustom",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg3 = wxString_in_helper(obj2);
@@ -11618,7 +11720,7 @@ static PyObject *_wrap_Grid_SetColFormatCustom(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_EnableGridLines(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_EnableGridLines(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -11632,7 +11734,7 @@ static PyObject *_wrap_Grid_EnableGridLines(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -11649,7 +11751,7 @@ static PyObject *_wrap_Grid_EnableGridLines(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_GridLinesEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GridLinesEnabled(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -11677,7 +11779,7 @@ static PyObject *_wrap_Grid_GridLinesEnabled(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -11696,14 +11798,14 @@ static PyObject *_wrap_Grid_GetDefaultRowSize(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11717,7 +11819,7 @@ static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetRowSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11726,14 +11828,14 @@ static PyObject *_wrap_Grid_GetRowSize(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -11752,14 +11854,14 @@ static PyObject *_wrap_Grid_GetDefaultColSize(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11773,7 +11875,7 @@ static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_GetColSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11782,14 +11884,14 @@ static PyObject *_wrap_Grid_GetColSize(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultCellBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -11819,7 +11921,7 @@ static PyObject *_wrap_Grid_GetDefaultCellBackgroundColour(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_Grid_GetCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11835,9 +11937,9 @@ static PyObject *_wrap_Grid_GetCellBackgroundColour(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellBackgroundColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11857,7 +11959,7 @@ static PyObject *_wrap_Grid_GetCellBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultCellTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -11887,7 +11989,7 @@ static PyObject *_wrap_Grid_GetDefaultCellTextColour(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_GetCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11903,9 +12005,9 @@ static PyObject *_wrap_Grid_GetCellTextColour(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellTextColour",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11925,7 +12027,7 @@ static PyObject *_wrap_Grid_GetCellTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultCellFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultCellFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxFont result;
@@ -11955,7 +12057,7 @@ static PyObject *_wrap_Grid_GetDefaultCellFont(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_GetCellFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -11971,9 +12073,9 @@ static PyObject *_wrap_Grid_GetCellFont(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellFont",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -11993,20 +12095,22 @@ static PyObject *_wrap_Grid_GetCellFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultCellAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_GetDefaultCellAlignment",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -12018,21 +12122,17 @@ static PyObject *_wrap_Grid_GetDefaultCellAlignment(PyObject *self, PyObject *ar
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12040,7 +12140,9 @@ static PyObject *_wrap_Grid_GetCellAlignment(PyObject *self, PyObject *args, PyO
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12048,14 +12150,14 @@ static PyObject *_wrap_Grid_GetCellAlignment(PyObject *self, PyObject *args, PyO
         (char *) "self",(char *) "row",(char *) "col", NULL 
     };
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12065,21 +12167,17 @@ static PyObject *_wrap_Grid_GetCellAlignment(PyObject *self, PyObject *args, PyO
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultCellOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultCellOverflow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -12107,7 +12205,7 @@ static PyObject *_wrap_Grid_GetDefaultCellOverflow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellOverflow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12123,9 +12221,9 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellOverflow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12143,7 +12241,7 @@ static PyObject *_wrap_Grid_GetCellOverflow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_GetCellSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12151,7 +12249,9 @@ static PyObject *_wrap_Grid_GetCellSize(PyObject *self, PyObject *args, PyObject
     int *arg4 = (int *) 0 ;
     int *arg5 = (int *) 0 ;
     int temp4 ;
+    int res4 = 0 ;
     int temp5 ;
+    int res5 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     PyObject * obj2 = 0 ;
@@ -12159,14 +12259,14 @@ static PyObject *_wrap_Grid_GetCellSize(PyObject *self, PyObject *args, PyObject
         (char *) "self",(char *) "row",(char *) "col", NULL 
     };
     
-    arg4 = &temp4;
-    arg5 = &temp5;
+    arg4 = &temp4; res4 = SWIG_NEWOBJ;
+    arg5 = &temp5; res5 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12176,21 +12276,17 @@ static PyObject *_wrap_Grid_GetCellSize(PyObject *self, PyObject *args, PyObject
         if (PyErr_Occurred()) SWIG_fail;
     }
     Py_INCREF(Py_None); resultobj = Py_None;
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg4));
-        resultobj = t_output_helper(resultobj,o);
-    }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg5));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res4 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg4)) : SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res5 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg5)) : SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12205,10 +12301,10 @@ static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SetDefaultRowSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12225,7 +12321,7 @@ static PyObject *_wrap_Grid_SetDefaultRowSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_SetRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12240,9 +12336,9 @@ static PyObject *_wrap_Grid_SetRowSize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12258,7 +12354,7 @@ static PyObject *_wrap_Grid_SetRowSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12273,10 +12369,10 @@ static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SetDefaultColSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12293,7 +12389,7 @@ static PyObject *_wrap_Grid_SetDefaultColSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_SetColSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12308,9 +12404,9 @@ static PyObject *_wrap_Grid_SetColSize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12326,7 +12422,7 @@ static PyObject *_wrap_Grid_SetColSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12341,10 +12437,10 @@ static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *self, PyObject *args, PyObj
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_AutoSizeColumn",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12361,7 +12457,7 @@ static PyObject *_wrap_Grid_AutoSizeColumn(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSizeRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12376,10 +12472,10 @@ static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_AutoSizeRow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12396,7 +12492,7 @@ static PyObject *_wrap_Grid_AutoSizeRow(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -12410,7 +12506,7 @@ static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyOb
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12427,7 +12523,7 @@ static PyObject *_wrap_Grid_AutoSizeColumns(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_AutoSizeRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSizeRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 = (bool) True ;
@@ -12441,7 +12537,7 @@ static PyObject *_wrap_Grid_AutoSizeRows(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (bool) SWIG_AsBool(obj1); 
+        arg2 = (bool)SWIG_As_bool(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -12458,7 +12554,7 @@ static PyObject *_wrap_Grid_AutoSizeRows(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_AutoSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -12483,7 +12579,7 @@ static PyObject *_wrap_Grid_AutoSize(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Grid_AutoSizeRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSizeRowLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12496,7 +12592,7 @@ static PyObject *_wrap_Grid_AutoSizeRowLabelSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_AutoSizeRowLabelSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12512,7 +12608,7 @@ static PyObject *_wrap_Grid_AutoSizeRowLabelSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_AutoSizeColLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_AutoSizeColLabelSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12525,7 +12621,7 @@ static PyObject *_wrap_Grid_AutoSizeColLabelSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_AutoSizeColLabelSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12541,7 +12637,7 @@ static PyObject *_wrap_Grid_AutoSizeColLabelSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_SetColMinimalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColMinimalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12556,9 +12652,9 @@ static PyObject *_wrap_Grid_SetColMinimalWidth(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetColMinimalWidth",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12574,7 +12670,7 @@ static PyObject *_wrap_Grid_SetColMinimalWidth(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_SetRowMinimalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowMinimalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12589,9 +12685,9 @@ static PyObject *_wrap_Grid_SetRowMinimalHeight(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetRowMinimalHeight",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12607,7 +12703,7 @@ static PyObject *_wrap_Grid_SetRowMinimalHeight(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_Grid_SetColMinimalAcceptableWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetColMinimalAcceptableWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12620,7 +12716,7 @@ static PyObject *_wrap_Grid_SetColMinimalAcceptableWidth(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetColMinimalAcceptableWidth",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12636,7 +12732,7 @@ static PyObject *_wrap_Grid_SetColMinimalAcceptableWidth(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_SetRowMinimalAcceptableHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetRowMinimalAcceptableHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12649,7 +12745,7 @@ static PyObject *_wrap_Grid_SetRowMinimalAcceptableHeight(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetRowMinimalAcceptableHeight",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12665,7 +12761,7 @@ static PyObject *_wrap_Grid_SetRowMinimalAcceptableHeight(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_Grid_GetColMinimalAcceptableWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetColMinimalAcceptableWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -12684,14 +12780,14 @@ static PyObject *_wrap_Grid_GetColMinimalAcceptableWidth(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_GetRowMinimalAcceptableHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetRowMinimalAcceptableHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int result;
@@ -12710,14 +12806,14 @@ static PyObject *_wrap_Grid_GetRowMinimalAcceptableHeight(PyObject *self, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultCellBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -12749,7 +12845,7 @@ static PyObject *_wrap_Grid_SetDefaultCellBackgroundColour(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_Grid_SetCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12767,9 +12863,9 @@ static PyObject *_wrap_Grid_SetCellBackgroundColour(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellBackgroundColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = &temp4;
@@ -12789,7 +12885,7 @@ static PyObject *_wrap_Grid_SetCellBackgroundColour(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultCellTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -12821,7 +12917,7 @@ static PyObject *_wrap_Grid_SetDefaultCellTextColour(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_SetCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12839,9 +12935,9 @@ static PyObject *_wrap_Grid_SetCellTextColour(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellTextColour",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = &temp4;
@@ -12861,7 +12957,7 @@ static PyObject *_wrap_Grid_SetCellTextColour(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultCellFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultCellFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxFont *arg2 = 0 ;
@@ -12895,7 +12991,7 @@ static PyObject *_wrap_Grid_SetDefaultCellFont(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_SetCellFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12912,9 +13008,9 @@ static PyObject *_wrap_Grid_SetCellFont(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellFont",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxFont,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -12937,7 +13033,7 @@ static PyObject *_wrap_Grid_SetCellFont(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultCellAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12952,9 +13048,9 @@ static PyObject *_wrap_Grid_SetDefaultCellAlignment(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetDefaultCellAlignment",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -12970,7 +13066,7 @@ static PyObject *_wrap_Grid_SetDefaultCellAlignment(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Grid_SetCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellAlignment(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -12989,13 +13085,13 @@ static PyObject *_wrap_Grid_SetCellAlignment(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Grid_SetCellAlignment",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13011,7 +13107,7 @@ static PyObject *_wrap_Grid_SetCellAlignment(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultCellOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultCellOverflow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool arg2 ;
@@ -13024,7 +13120,7 @@ static PyObject *_wrap_Grid_SetDefaultCellOverflow(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_SetDefaultCellOverflow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13040,7 +13136,7 @@ static PyObject *_wrap_Grid_SetDefaultCellOverflow(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_SetCellOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellOverflow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13057,11 +13153,11 @@ static PyObject *_wrap_Grid_SetCellOverflow(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellOverflow",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (bool) SWIG_AsBool(obj3); 
+    arg4 = (bool)SWIG_As_bool(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13077,7 +13173,7 @@ static PyObject *_wrap_Grid_SetCellOverflow(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_SetCellSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13096,13 +13192,13 @@ static PyObject *_wrap_Grid_SetCellSize(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:Grid_SetCellSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13118,7 +13214,7 @@ static PyObject *_wrap_Grid_SetCellSize(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellRenderer *arg2 = (wxGridCellRenderer *) 0 ;
@@ -13147,7 +13243,7 @@ static PyObject *_wrap_Grid_SetDefaultRenderer(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_SetCellRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13164,9 +13260,9 @@ static PyObject *_wrap_Grid_SetCellRenderer(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellRenderer",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGridCellRenderer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -13184,7 +13280,7 @@ static PyObject *_wrap_Grid_SetCellRenderer(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellRenderer *result;
@@ -13212,7 +13308,7 @@ static PyObject *_wrap_Grid_GetDefaultRenderer(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Grid_GetCellRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13228,9 +13324,9 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellRenderer",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13248,7 +13344,7 @@ static PyObject *_wrap_Grid_GetCellRenderer(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_SetDefaultEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetDefaultEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellEditor *arg2 = (wxGridCellEditor *) 0 ;
@@ -13277,7 +13373,7 @@ static PyObject *_wrap_Grid_SetDefaultEditor(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_SetCellEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13294,9 +13390,9 @@ static PyObject *_wrap_Grid_SetCellEditor(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellEditor",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_wxGridCellEditor,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -13314,7 +13410,7 @@ static PyObject *_wrap_Grid_SetCellEditor(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellEditor *result;
@@ -13342,7 +13438,7 @@ static PyObject *_wrap_Grid_GetDefaultEditor(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetCellEditor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellEditor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13358,9 +13454,9 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellEditor",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13378,7 +13474,7 @@ static PyObject *_wrap_Grid_GetCellEditor(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Grid_GetCellValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetCellValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13394,9 +13490,9 @@ static PyObject *_wrap_Grid_GetCellValue(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetCellValue",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13418,7 +13514,7 @@ static PyObject *_wrap_Grid_GetCellValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetCellValue(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13436,9 +13532,9 @@ static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Grid_SetCellValue",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         arg4 = wxString_in_helper(obj3);
@@ -13467,7 +13563,7 @@ static PyObject *_wrap_Grid_SetCellValue(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13483,9 +13579,9 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_IsReadOnly",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13503,7 +13599,7 @@ static PyObject *_wrap_Grid_IsReadOnly(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SetReadOnly(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetReadOnly(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13520,12 +13616,12 @@ static PyObject *_wrap_Grid_SetReadOnly(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Grid_SetReadOnly",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13542,7 +13638,7 @@ static PyObject *_wrap_Grid_SetReadOnly(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SelectRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SelectRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13557,10 +13653,10 @@ static PyObject *_wrap_Grid_SelectRow(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SelectRow",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13577,7 +13673,7 @@ static PyObject *_wrap_Grid_SelectRow(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_SelectCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SelectCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13592,10 +13688,10 @@ static PyObject *_wrap_Grid_SelectCol(PyObject *self, PyObject *args, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Grid_SelectCol",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13612,7 +13708,7 @@ static PyObject *_wrap_Grid_SelectCol(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_SelectBlock(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SelectBlock(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13633,16 +13729,16 @@ static PyObject *_wrap_Grid_SelectBlock(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:Grid_SelectBlock",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (bool) SWIG_AsBool(obj5); 
+        arg6 = (bool)SWIG_As_bool(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -13659,7 +13755,7 @@ static PyObject *_wrap_Grid_SelectBlock(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13684,7 +13780,7 @@ static PyObject *_wrap_Grid_SelectAll(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_IsSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     bool result;
@@ -13712,7 +13808,7 @@ static PyObject *_wrap_Grid_IsSelection(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_ClearSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_ClearSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     PyObject * obj0 = 0 ;
@@ -13737,7 +13833,7 @@ static PyObject *_wrap_Grid_ClearSelection(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_IsInSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13753,9 +13849,9 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_IsInSelection",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13773,7 +13869,7 @@ static PyObject *_wrap_Grid_IsInSelection(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Grid_GetSelectedCells(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectedCells(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellCoordsArray result;
@@ -13801,7 +13897,7 @@ static PyObject *_wrap_Grid_GetSelectedCells(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetSelectionBlockTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectionBlockTopLeft(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellCoordsArray result;
@@ -13829,7 +13925,7 @@ static PyObject *_wrap_Grid_GetSelectionBlockTopLeft(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_GetSelectionBlockBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectionBlockBottomRight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellCoordsArray result;
@@ -13857,7 +13953,7 @@ static PyObject *_wrap_Grid_GetSelectionBlockBottomRight(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_GetSelectedRows(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectedRows(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxArrayInt result;
@@ -13891,7 +13987,7 @@ static PyObject *_wrap_Grid_GetSelectedRows(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_GetSelectedCols(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectedCols(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxArrayInt result;
@@ -13925,7 +14021,7 @@ static PyObject *_wrap_Grid_GetSelectedCols(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_Grid_DeselectRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DeselectRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13938,7 +14034,7 @@ static PyObject *_wrap_Grid_DeselectRow(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_DeselectRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13954,7 +14050,7 @@ static PyObject *_wrap_Grid_DeselectRow(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_DeselectCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DeselectCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13967,7 +14063,7 @@ static PyObject *_wrap_Grid_DeselectCol(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Grid_DeselectCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -13983,7 +14079,7 @@ static PyObject *_wrap_Grid_DeselectCol(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_DeselectCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_DeselectCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -13998,9 +14094,9 @@ static PyObject *_wrap_Grid_DeselectCell(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_DeselectCell",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14016,7 +14112,7 @@ static PyObject *_wrap_Grid_DeselectCell(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_Grid_BlockToDeviceRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_BlockToDeviceRect(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxGridCellCoords *arg2 = 0 ;
@@ -14060,7 +14156,7 @@ static PyObject *_wrap_Grid_BlockToDeviceRect(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_Grid_GetSelectionBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectionBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -14090,7 +14186,7 @@ static PyObject *_wrap_Grid_GetSelectionBackground(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_GetSelectionForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetSelectionForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour result;
@@ -14120,7 +14216,7 @@ static PyObject *_wrap_Grid_GetSelectionForeground(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_SetSelectionBackground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetSelectionBackground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -14152,7 +14248,7 @@ static PyObject *_wrap_Grid_SetSelectionBackground(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_SetSelectionForeground(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetSelectionForeground(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxColour *arg2 = 0 ;
@@ -14184,7 +14280,7 @@ static PyObject *_wrap_Grid_SetSelectionForeground(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_Grid_RegisterDataType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_RegisterDataType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxString *arg2 = 0 ;
@@ -14233,7 +14329,7 @@ static PyObject *_wrap_Grid_RegisterDataType(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -14249,9 +14345,9 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetDefaultEditorForCell",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14269,7 +14365,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForCell(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -14285,9 +14381,9 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetDefaultRendererForCell",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14305,7 +14401,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForCell(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxString *arg2 = 0 ;
@@ -14349,7 +14445,7 @@ static PyObject *_wrap_Grid_GetDefaultEditorForType(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxString *arg2 = 0 ;
@@ -14393,7 +14489,7 @@ static PyObject *_wrap_Grid_GetDefaultRendererForType(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_Grid_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     int arg2 ;
@@ -14408,9 +14504,9 @@ static PyObject *_wrap_Grid_SetMargins(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_SetMargins",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -14426,7 +14522,7 @@ static PyObject *_wrap_Grid_SetMargins(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Grid_GetGridWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxWindow *result;
@@ -14454,7 +14550,7 @@ static PyObject *_wrap_Grid_GetGridWindow(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Grid_GetGridRowLabelWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridRowLabelWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxWindow *result;
@@ -14482,7 +14578,7 @@ static PyObject *_wrap_Grid_GetGridRowLabelWindow(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Grid_GetGridColLabelWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridColLabelWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxWindow *result;
@@ -14510,7 +14606,7 @@ static PyObject *_wrap_Grid_GetGridColLabelWindow(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_Grid_GetGridCornerLabelWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetGridCornerLabelWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGrid *arg1 = (wxGrid *) 0 ;
     wxWindow *result;
@@ -14538,7 +14634,7 @@ static PyObject *_wrap_Grid_GetGridCornerLabelWindow(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_Grid_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Grid_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -14549,7 +14645,7 @@ static PyObject *_wrap_Grid_GetClassDefaultAttributes(PyObject *self, PyObject *
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:Grid_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14571,14 +14667,14 @@ static PyObject *_wrap_Grid_GetClassDefaultAttributes(PyObject *self, PyObject *
 }
 
 
-static PyObject * Grid_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Grid_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGrid, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxEventType arg2 ;
@@ -14610,46 +14706,46 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOOOO:new_GridEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (int) SWIG_AsInt(obj6); 
+        arg7 = (int)SWIG_As_int(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (bool) SWIG_AsBool(obj7); 
+        arg8 = (bool)SWIG_As_bool(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (bool) SWIG_AsBool(obj8); 
+        arg9 = (bool)SWIG_As_bool(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
-        arg10 = (bool) SWIG_AsBool(obj9); 
+        arg10 = (bool)SWIG_As_bool(obj9); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj10) {
-        arg11 = (bool) SWIG_AsBool(obj10); 
+        arg11 = (bool)SWIG_As_bool(obj10); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj11) {
-        arg12 = (bool) SWIG_AsBool(obj11); 
+        arg12 = (bool)SWIG_As_bool(obj11); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14666,7 +14762,7 @@ static PyObject *_wrap_new_GridEvent(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_GridEvent_GetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_GetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     int result;
@@ -14685,14 +14781,14 @@ static PyObject *_wrap_GridEvent_GetRow(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridEvent_GetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_GetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     int result;
@@ -14711,14 +14807,14 @@ static PyObject *_wrap_GridEvent_GetCol(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     wxPoint result;
@@ -14748,7 +14844,7 @@ static PyObject *_wrap_GridEvent_GetPosition(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridEvent_Selecting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_Selecting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     bool result;
@@ -14776,7 +14872,7 @@ static PyObject *_wrap_GridEvent_Selecting(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GridEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     bool result;
@@ -14804,7 +14900,7 @@ static PyObject *_wrap_GridEvent_ControlDown(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_GridEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     bool result;
@@ -14832,7 +14928,7 @@ static PyObject *_wrap_GridEvent_MetaDown(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_GridEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     bool result;
@@ -14860,7 +14956,7 @@ static PyObject *_wrap_GridEvent_ShiftDown(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_GridEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEvent *arg1 = (wxGridEvent *) 0 ;
     bool result;
@@ -14888,14 +14984,14 @@ static PyObject *_wrap_GridEvent_AltDown(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject * GridEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridSizeEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxEventType arg2 ;
@@ -14923,38 +15019,38 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOOOO:new_GridSizeEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (bool) SWIG_AsBool(obj7); 
+        arg8 = (bool)SWIG_As_bool(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (bool) SWIG_AsBool(obj8); 
+        arg9 = (bool)SWIG_As_bool(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
-        arg10 = (bool) SWIG_AsBool(obj9); 
+        arg10 = (bool)SWIG_As_bool(obj9); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -14971,7 +15067,7 @@ static PyObject *_wrap_new_GridSizeEvent(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_GridSizeEvent_GetRowOrCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizeEvent_GetRowOrCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
     int result;
@@ -14990,14 +15086,14 @@ static PyObject *_wrap_GridSizeEvent_GetRowOrCol(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridSizeEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizeEvent_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
     wxPoint result;
@@ -15027,7 +15123,7 @@ static PyObject *_wrap_GridSizeEvent_GetPosition(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridSizeEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizeEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
     bool result;
@@ -15055,7 +15151,7 @@ static PyObject *_wrap_GridSizeEvent_ControlDown(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridSizeEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizeEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
     bool result;
@@ -15083,7 +15179,7 @@ static PyObject *_wrap_GridSizeEvent_MetaDown(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_GridSizeEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizeEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
     bool result;
@@ -15111,7 +15207,7 @@ static PyObject *_wrap_GridSizeEvent_ShiftDown(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_GridSizeEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridSizeEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
     bool result;
@@ -15139,14 +15235,14 @@ static PyObject *_wrap_GridSizeEvent_AltDown(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * GridSizeEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridSizeEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridSizeEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxEventType arg2 ;
@@ -15176,9 +15272,9 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args,
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|OOOOO:new_GridRangeSelectEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxGrid,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15191,23 +15287,23 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args,
         if (! wxGridCellCoords_helper(obj4, &arg5)) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (bool) SWIG_AsBool(obj5); 
+        arg6 = (bool)SWIG_As_bool(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
-        arg7 = (bool) SWIG_AsBool(obj6); 
+        arg7 = (bool)SWIG_As_bool(obj6); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (bool) SWIG_AsBool(obj7); 
+        arg8 = (bool)SWIG_As_bool(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj8) {
-        arg9 = (bool) SWIG_AsBool(obj8); 
+        arg9 = (bool)SWIG_As_bool(obj8); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj9) {
-        arg10 = (bool) SWIG_AsBool(obj9); 
+        arg10 = (bool)SWIG_As_bool(obj9); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -15224,7 +15320,7 @@ static PyObject *_wrap_new_GridRangeSelectEvent(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_GetTopLeftCoords(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_GetTopLeftCoords(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     wxGridCellCoords result;
@@ -15254,7 +15350,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetTopLeftCoords(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_GetBottomRightCoords(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_GetBottomRightCoords(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     wxGridCellCoords result;
@@ -15284,7 +15380,7 @@ static PyObject *_wrap_GridRangeSelectEvent_GetBottomRightCoords(PyObject *self,
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_GetTopRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_GetTopRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     int result;
@@ -15303,14 +15399,14 @@ static PyObject *_wrap_GridRangeSelectEvent_GetTopRow(PyObject *self, PyObject *
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_GetBottomRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_GetBottomRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     int result;
@@ -15329,14 +15425,14 @@ static PyObject *_wrap_GridRangeSelectEvent_GetBottomRow(PyObject *self, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_GetLeftCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_GetLeftCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     int result;
@@ -15355,14 +15451,14 @@ static PyObject *_wrap_GridRangeSelectEvent_GetLeftCol(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_GetRightCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_GetRightCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     int result;
@@ -15381,14 +15477,14 @@ static PyObject *_wrap_GridRangeSelectEvent_GetRightCol(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_Selecting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_Selecting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     bool result;
@@ -15416,7 +15512,7 @@ static PyObject *_wrap_GridRangeSelectEvent_Selecting(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_ControlDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     bool result;
@@ -15444,7 +15540,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ControlDown(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_MetaDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     bool result;
@@ -15472,7 +15568,7 @@ static PyObject *_wrap_GridRangeSelectEvent_MetaDown(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_ShiftDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     bool result;
@@ -15500,7 +15596,7 @@ static PyObject *_wrap_GridRangeSelectEvent_ShiftDown(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_GridRangeSelectEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridRangeSelectEvent_AltDown(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
     bool result;
@@ -15528,14 +15624,14 @@ static PyObject *_wrap_GridRangeSelectEvent_AltDown(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * GridRangeSelectEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridRangeSelectEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridRangeSelectEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_GridEditorCreatedEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_GridEditorCreatedEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 ;
     wxEventType arg2 ;
@@ -15555,15 +15651,15 @@ static PyObject *_wrap_new_GridEditorCreatedEvent(PyObject *self, PyObject *args
     };
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:new_GridEditorCreatedEvent",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
-    arg1 = (int) SWIG_AsInt(obj0); 
+    arg1 = (int)SWIG_As_int(obj0); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg2 = (wxEventType) SWIG_AsInt(obj1); 
+    arg2 = (wxEventType)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxObject,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj5,(void **)(&arg6),SWIGTYPE_p_wxControl,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -15581,7 +15677,7 @@ static PyObject *_wrap_new_GridEditorCreatedEvent(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_GridEditorCreatedEvent_GetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEditorCreatedEvent_GetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ;
     int result;
@@ -15600,14 +15696,14 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetRow(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridEditorCreatedEvent_GetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEditorCreatedEvent_GetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ;
     int result;
@@ -15626,14 +15722,14 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetCol(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_GridEditorCreatedEvent_GetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEditorCreatedEvent_GetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ;
     wxControl *result;
@@ -15661,7 +15757,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_GetControl(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_GridEditorCreatedEvent_SetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEditorCreatedEvent_SetRow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ;
     int arg2 ;
@@ -15674,7 +15770,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetRow(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridEditorCreatedEvent_SetRow",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridEditorCreatedEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15690,7 +15786,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetRow(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridEditorCreatedEvent_SetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEditorCreatedEvent_SetCol(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ;
     int arg2 ;
@@ -15703,7 +15799,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetCol(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridEditorCreatedEvent_SetCol",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGridEditorCreatedEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -15719,7 +15815,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetCol(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_GridEditorCreatedEvent_SetControl(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_GridEditorCreatedEvent_SetControl(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxGridEditorCreatedEvent *arg1 = (wxGridEditorCreatedEvent *) 0 ;
     wxControl *arg2 = (wxControl *) 0 ;
@@ -15748,7 +15844,7 @@ static PyObject *_wrap_GridEditorCreatedEvent_SetControl(PyObject *self, PyObjec
 }
 
 
-static PyObject * GridEditorCreatedEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * GridEditorCreatedEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxGridEditorCreatedEvent, obj);
@@ -15756,463 +15852,463 @@ static PyObject * GridEditorCreatedEvent_swigregister(PyObject *self, PyObject *
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"GridCellRenderer__setOORInfo", (PyCFunction) _wrap_GridCellRenderer__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_SetParameters", (PyCFunction) _wrap_GridCellRenderer_SetParameters, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_IncRef", (PyCFunction) _wrap_GridCellRenderer_IncRef, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_DecRef", (PyCFunction) _wrap_GridCellRenderer_DecRef, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_Draw", (PyCFunction) _wrap_GridCellRenderer_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_GetBestSize", (PyCFunction) _wrap_GridCellRenderer_GetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_Clone", (PyCFunction) _wrap_GridCellRenderer_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellRenderer_swigregister", GridCellRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_PyGridCellRenderer", (PyCFunction) _wrap_new_PyGridCellRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellRenderer__setCallbackInfo", (PyCFunction) _wrap_PyGridCellRenderer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellRenderer_base_SetParameters", (PyCFunction) _wrap_PyGridCellRenderer_base_SetParameters, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellRenderer_swigregister", PyGridCellRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellStringRenderer", (PyCFunction) _wrap_new_GridCellStringRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellStringRenderer_swigregister", GridCellStringRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellNumberRenderer", (PyCFunction) _wrap_new_GridCellNumberRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellNumberRenderer_swigregister", GridCellNumberRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellFloatRenderer", (PyCFunction) _wrap_new_GridCellFloatRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatRenderer_GetWidth", (PyCFunction) _wrap_GridCellFloatRenderer_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatRenderer_SetWidth", (PyCFunction) _wrap_GridCellFloatRenderer_SetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatRenderer_GetPrecision", (PyCFunction) _wrap_GridCellFloatRenderer_GetPrecision, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatRenderer_SetPrecision", (PyCFunction) _wrap_GridCellFloatRenderer_SetPrecision, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatRenderer_swigregister", GridCellFloatRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellBoolRenderer", (PyCFunction) _wrap_new_GridCellBoolRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellBoolRenderer_swigregister", GridCellBoolRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellDateTimeRenderer", (PyCFunction) _wrap_new_GridCellDateTimeRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellDateTimeRenderer_swigregister", GridCellDateTimeRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellEnumRenderer", (PyCFunction) _wrap_new_GridCellEnumRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEnumRenderer_swigregister", GridCellEnumRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellAutoWrapStringRenderer", (PyCFunction) _wrap_new_GridCellAutoWrapStringRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAutoWrapStringRenderer_swigregister", GridCellAutoWrapStringRenderer_swigregister, METH_VARARGS },
-        { (char *)"GridCellEditor__setOORInfo", (PyCFunction) _wrap_GridCellEditor__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_IsCreated", (PyCFunction) _wrap_GridCellEditor_IsCreated, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_GetControl", (PyCFunction) _wrap_GridCellEditor_GetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_SetControl", (PyCFunction) _wrap_GridCellEditor_SetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_GetCellAttr", (PyCFunction) _wrap_GridCellEditor_GetCellAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_SetCellAttr", (PyCFunction) _wrap_GridCellEditor_SetCellAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_SetParameters", (PyCFunction) _wrap_GridCellEditor_SetParameters, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_IncRef", (PyCFunction) _wrap_GridCellEditor_IncRef, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_DecRef", (PyCFunction) _wrap_GridCellEditor_DecRef, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_Create", (PyCFunction) _wrap_GridCellEditor_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_BeginEdit", (PyCFunction) _wrap_GridCellEditor_BeginEdit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_EndEdit", (PyCFunction) _wrap_GridCellEditor_EndEdit, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_Reset", (PyCFunction) _wrap_GridCellEditor_Reset, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_Clone", (PyCFunction) _wrap_GridCellEditor_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_SetSize", (PyCFunction) _wrap_GridCellEditor_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_Show", (PyCFunction) _wrap_GridCellEditor_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_PaintBackground", (PyCFunction) _wrap_GridCellEditor_PaintBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_IsAcceptedKey", (PyCFunction) _wrap_GridCellEditor_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_StartingKey", (PyCFunction) _wrap_GridCellEditor_StartingKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_StartingClick", (PyCFunction) _wrap_GridCellEditor_StartingClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_HandleReturn", (PyCFunction) _wrap_GridCellEditor_HandleReturn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_Destroy", (PyCFunction) _wrap_GridCellEditor_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEditor_swigregister", GridCellEditor_swigregister, METH_VARARGS },
-        { (char *)"new_PyGridCellEditor", (PyCFunction) _wrap_new_PyGridCellEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor__setCallbackInfo", (PyCFunction) _wrap_PyGridCellEditor__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_SetSize", (PyCFunction) _wrap_PyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_Show", (PyCFunction) _wrap_PyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_PyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_IsAcceptedKey", (PyCFunction) _wrap_PyGridCellEditor_base_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_StartingKey", (PyCFunction) _wrap_PyGridCellEditor_base_StartingKey, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_StartingClick", (PyCFunction) _wrap_PyGridCellEditor_base_StartingClick, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_HandleReturn", (PyCFunction) _wrap_PyGridCellEditor_base_HandleReturn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_Destroy", (PyCFunction) _wrap_PyGridCellEditor_base_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_base_SetParameters", (PyCFunction) _wrap_PyGridCellEditor_base_SetParameters, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellEditor_swigregister", PyGridCellEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellTextEditor", (PyCFunction) _wrap_new_GridCellTextEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellTextEditor_GetValue", (PyCFunction) _wrap_GridCellTextEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellTextEditor_swigregister", GridCellTextEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellNumberEditor", (PyCFunction) _wrap_new_GridCellNumberEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellNumberEditor_GetValue", (PyCFunction) _wrap_GridCellNumberEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellNumberEditor_swigregister", GridCellNumberEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellFloatEditor", (PyCFunction) _wrap_new_GridCellFloatEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatEditor_GetValue", (PyCFunction) _wrap_GridCellFloatEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellFloatEditor_swigregister", GridCellFloatEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellBoolEditor", (PyCFunction) _wrap_new_GridCellBoolEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellBoolEditor_GetValue", (PyCFunction) _wrap_GridCellBoolEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellBoolEditor_swigregister", GridCellBoolEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellChoiceEditor", (PyCFunction) _wrap_new_GridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellChoiceEditor_GetValue", (PyCFunction) _wrap_GridCellChoiceEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellChoiceEditor_swigregister", GridCellChoiceEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellEnumEditor", (PyCFunction) _wrap_new_GridCellEnumEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEnumEditor_GetValue", (PyCFunction) _wrap_GridCellEnumEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellEnumEditor_swigregister", GridCellEnumEditor_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellAutoWrapStringEditor", (PyCFunction) _wrap_new_GridCellAutoWrapStringEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAutoWrapStringEditor_GetValue", (PyCFunction) _wrap_GridCellAutoWrapStringEditor_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAutoWrapStringEditor_swigregister", GridCellAutoWrapStringEditor_swigregister, METH_VARARGS },
-        { (char *)"GridCellAttr__setOORInfo", (PyCFunction) _wrap_GridCellAttr__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_GridCellAttr", (PyCFunction) _wrap_new_GridCellAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_Clone", (PyCFunction) _wrap_GridCellAttr_Clone, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_MergeWith", (PyCFunction) _wrap_GridCellAttr_MergeWith, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_IncRef", (PyCFunction) _wrap_GridCellAttr_IncRef, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_DecRef", (PyCFunction) _wrap_GridCellAttr_DecRef, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetTextColour", (PyCFunction) _wrap_GridCellAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetBackgroundColour", (PyCFunction) _wrap_GridCellAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetFont", (PyCFunction) _wrap_GridCellAttr_SetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetAlignment", (PyCFunction) _wrap_GridCellAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetSize", (PyCFunction) _wrap_GridCellAttr_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetOverflow", (PyCFunction) _wrap_GridCellAttr_SetOverflow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetReadOnly", (PyCFunction) _wrap_GridCellAttr_SetReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetRenderer", (PyCFunction) _wrap_GridCellAttr_SetRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetEditor", (PyCFunction) _wrap_GridCellAttr_SetEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetKind", (PyCFunction) _wrap_GridCellAttr_SetKind, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasTextColour", (PyCFunction) _wrap_GridCellAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasBackgroundColour", (PyCFunction) _wrap_GridCellAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasFont", (PyCFunction) _wrap_GridCellAttr_HasFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasAlignment", (PyCFunction) _wrap_GridCellAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasRenderer", (PyCFunction) _wrap_GridCellAttr_HasRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasEditor", (PyCFunction) _wrap_GridCellAttr_HasEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasReadWriteMode", (PyCFunction) _wrap_GridCellAttr_HasReadWriteMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_HasOverflowMode", (PyCFunction) _wrap_GridCellAttr_HasOverflowMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetTextColour", (PyCFunction) _wrap_GridCellAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetBackgroundColour", (PyCFunction) _wrap_GridCellAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetFont", (PyCFunction) _wrap_GridCellAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetAlignment", (PyCFunction) _wrap_GridCellAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetSize", (PyCFunction) _wrap_GridCellAttr_GetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetOverflow", (PyCFunction) _wrap_GridCellAttr_GetOverflow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetRenderer", (PyCFunction) _wrap_GridCellAttr_GetRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetEditor", (PyCFunction) _wrap_GridCellAttr_GetEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_IsReadOnly", (PyCFunction) _wrap_GridCellAttr_IsReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_GetKind", (PyCFunction) _wrap_GridCellAttr_GetKind, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_SetDefAttr", (PyCFunction) _wrap_GridCellAttr_SetDefAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttr_swigregister", GridCellAttr_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellAttrProvider", (PyCFunction) _wrap_new_GridCellAttrProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider__setOORInfo", (PyCFunction) _wrap_GridCellAttrProvider__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_GetAttr", (PyCFunction) _wrap_GridCellAttrProvider_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_SetAttr", (PyCFunction) _wrap_GridCellAttrProvider_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_SetRowAttr", (PyCFunction) _wrap_GridCellAttrProvider_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_GridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_UpdateAttrRows", (PyCFunction) _wrap_GridCellAttrProvider_UpdateAttrRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_UpdateAttrCols", (PyCFunction) _wrap_GridCellAttrProvider_UpdateAttrCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellAttrProvider_swigregister", GridCellAttrProvider_swigregister, METH_VARARGS },
-        { (char *)"new_PyGridCellAttrProvider", (PyCFunction) _wrap_new_PyGridCellAttrProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellAttrProvider__setCallbackInfo", (PyCFunction) _wrap_PyGridCellAttrProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellAttrProvider_base_GetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellAttrProvider_base_SetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellAttrProvider_base_SetRowAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellAttrProvider_base_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetColAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS },
-        { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetAttrProvider", (PyCFunction) _wrap_GridTableBase_GetAttrProvider, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetView", (PyCFunction) _wrap_GridTableBase_SetView, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetView", (PyCFunction) _wrap_GridTableBase_GetView, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetNumberRows", (PyCFunction) _wrap_GridTableBase_GetNumberRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetNumberCols", (PyCFunction) _wrap_GridTableBase_GetNumberCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_IsEmptyCell", (PyCFunction) _wrap_GridTableBase_IsEmptyCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetValue", (PyCFunction) _wrap_GridTableBase_GetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetValue", (PyCFunction) _wrap_GridTableBase_SetValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetTypeName", (PyCFunction) _wrap_GridTableBase_GetTypeName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_CanGetValueAs", (PyCFunction) _wrap_GridTableBase_CanGetValueAs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_CanSetValueAs", (PyCFunction) _wrap_GridTableBase_CanSetValueAs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetValueAsLong", (PyCFunction) _wrap_GridTableBase_GetValueAsLong, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetValueAsDouble", (PyCFunction) _wrap_GridTableBase_GetValueAsDouble, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetValueAsBool", (PyCFunction) _wrap_GridTableBase_GetValueAsBool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetValueAsLong", (PyCFunction) _wrap_GridTableBase_SetValueAsLong, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetValueAsDouble", (PyCFunction) _wrap_GridTableBase_SetValueAsDouble, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetValueAsBool", (PyCFunction) _wrap_GridTableBase_SetValueAsBool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_Clear", (PyCFunction) _wrap_GridTableBase_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_InsertRows", (PyCFunction) _wrap_GridTableBase_InsertRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_AppendRows", (PyCFunction) _wrap_GridTableBase_AppendRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_DeleteRows", (PyCFunction) _wrap_GridTableBase_DeleteRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_InsertCols", (PyCFunction) _wrap_GridTableBase_InsertCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_AppendCols", (PyCFunction) _wrap_GridTableBase_AppendCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_DeleteCols", (PyCFunction) _wrap_GridTableBase_DeleteCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetRowLabelValue", (PyCFunction) _wrap_GridTableBase_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetColLabelValue", (PyCFunction) _wrap_GridTableBase_GetColLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetRowLabelValue", (PyCFunction) _wrap_GridTableBase_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetColLabelValue", (PyCFunction) _wrap_GridTableBase_SetColLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_CanHaveAttributes", (PyCFunction) _wrap_GridTableBase_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_GetAttr", (PyCFunction) _wrap_GridTableBase_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetAttr", (PyCFunction) _wrap_GridTableBase_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetRowAttr", (PyCFunction) _wrap_GridTableBase_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_SetColAttr", (PyCFunction) _wrap_GridTableBase_SetColAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableBase_swigregister", GridTableBase_swigregister, METH_VARARGS },
-        { (char *)"new_PyGridTableBase", (PyCFunction) _wrap_new_PyGridTableBase, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase__setCallbackInfo", (PyCFunction) _wrap_PyGridTableBase__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_Destroy", (PyCFunction) _wrap_PyGridTableBase_Destroy, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_GetTypeName", (PyCFunction) _wrap_PyGridTableBase_base_GetTypeName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_CanGetValueAs", (PyCFunction) _wrap_PyGridTableBase_base_CanGetValueAs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_CanSetValueAs", (PyCFunction) _wrap_PyGridTableBase_base_CanSetValueAs, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_Clear", (PyCFunction) _wrap_PyGridTableBase_base_Clear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_InsertRows", (PyCFunction) _wrap_PyGridTableBase_base_InsertRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_AppendRows", (PyCFunction) _wrap_PyGridTableBase_base_AppendRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_DeleteRows", (PyCFunction) _wrap_PyGridTableBase_base_DeleteRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_InsertCols", (PyCFunction) _wrap_PyGridTableBase_base_InsertCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_AppendCols", (PyCFunction) _wrap_PyGridTableBase_base_AppendCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_DeleteCols", (PyCFunction) _wrap_PyGridTableBase_base_DeleteCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_GetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_GetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_GetColLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_SetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_SetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_SetColLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_CanHaveAttributes", (PyCFunction) _wrap_PyGridTableBase_base_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_GetAttr", (PyCFunction) _wrap_PyGridTableBase_base_GetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_SetAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_SetRowAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_base_SetColAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetColAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyGridTableBase_swigregister", PyGridTableBase_swigregister, METH_VARARGS },
-        { (char *)"new_GridStringTable", (PyCFunction) _wrap_new_GridStringTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridStringTable_swigregister", GridStringTable_swigregister, METH_VARARGS },
-        { (char *)"new_GridTableMessage", (PyCFunction) _wrap_new_GridTableMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_GridTableMessage", (PyCFunction) _wrap_delete_GridTableMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_SetTableObject", (PyCFunction) _wrap_GridTableMessage_SetTableObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_GetTableObject", (PyCFunction) _wrap_GridTableMessage_GetTableObject, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_SetId", (PyCFunction) _wrap_GridTableMessage_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_GetId", (PyCFunction) _wrap_GridTableMessage_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_SetCommandInt", (PyCFunction) _wrap_GridTableMessage_SetCommandInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_GetCommandInt", (PyCFunction) _wrap_GridTableMessage_GetCommandInt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_SetCommandInt2", (PyCFunction) _wrap_GridTableMessage_SetCommandInt2, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_GetCommandInt2", (PyCFunction) _wrap_GridTableMessage_GetCommandInt2, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridTableMessage_swigregister", GridTableMessage_swigregister, METH_VARARGS },
-        { (char *)"new_GridCellCoords", (PyCFunction) _wrap_new_GridCellCoords, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_GridCellCoords", (PyCFunction) _wrap_delete_GridCellCoords, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_GetRow", (PyCFunction) _wrap_GridCellCoords_GetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_SetRow", (PyCFunction) _wrap_GridCellCoords_SetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_GetCol", (PyCFunction) _wrap_GridCellCoords_GetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_SetCol", (PyCFunction) _wrap_GridCellCoords_SetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_Set", (PyCFunction) _wrap_GridCellCoords_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords___eq__", (PyCFunction) _wrap_GridCellCoords___eq__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords___ne__", (PyCFunction) _wrap_GridCellCoords___ne__, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_Get", (PyCFunction) _wrap_GridCellCoords_Get, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridCellCoords_swigregister", GridCellCoords_swigregister, METH_VARARGS },
-        { (char *)"new_Grid", (PyCFunction) _wrap_new_Grid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreGrid", (PyCFunction) _wrap_new_PreGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_Create", (PyCFunction) _wrap_Grid_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CreateGrid", (PyCFunction) _wrap_Grid_CreateGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetSelectionMode", (PyCFunction) _wrap_Grid_SetSelectionMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectionMode", (PyCFunction) _wrap_Grid_GetSelectionMode, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetNumberRows", (PyCFunction) _wrap_Grid_GetNumberRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetNumberCols", (PyCFunction) _wrap_Grid_GetNumberCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_ProcessTableMessage", (PyCFunction) _wrap_Grid_ProcessTableMessage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetTable", (PyCFunction) _wrap_Grid_GetTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetTable", (PyCFunction) _wrap_Grid_SetTable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_ClearGrid", (PyCFunction) _wrap_Grid_ClearGrid, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_InsertRows", (PyCFunction) _wrap_Grid_InsertRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AppendRows", (PyCFunction) _wrap_Grid_AppendRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DeleteRows", (PyCFunction) _wrap_Grid_DeleteRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_InsertCols", (PyCFunction) _wrap_Grid_InsertCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AppendCols", (PyCFunction) _wrap_Grid_AppendCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DeleteCols", (PyCFunction) _wrap_Grid_DeleteCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DrawCellHighlight", (PyCFunction) _wrap_Grid_DrawCellHighlight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DrawTextRectangle", (PyCFunction) _wrap_Grid_DrawTextRectangle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetTextBoxSize", (PyCFunction) _wrap_Grid_GetTextBoxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_BeginBatch", (PyCFunction) _wrap_Grid_BeginBatch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EndBatch", (PyCFunction) _wrap_Grid_EndBatch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetBatchCount", (PyCFunction) _wrap_Grid_GetBatchCount, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_ForceRefresh", (PyCFunction) _wrap_Grid_ForceRefresh, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsEditable", (PyCFunction) _wrap_Grid_IsEditable, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableEditing", (PyCFunction) _wrap_Grid_EnableEditing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableCellEditControl", (PyCFunction) _wrap_Grid_EnableCellEditControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DisableCellEditControl", (PyCFunction) _wrap_Grid_DisableCellEditControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CanEnableCellControl", (PyCFunction) _wrap_Grid_CanEnableCellControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsCellEditControlEnabled", (PyCFunction) _wrap_Grid_IsCellEditControlEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsCellEditControlShown", (PyCFunction) _wrap_Grid_IsCellEditControlShown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsCurrentCellReadOnly", (PyCFunction) _wrap_Grid_IsCurrentCellReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_ShowCellEditControl", (PyCFunction) _wrap_Grid_ShowCellEditControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_HideCellEditControl", (PyCFunction) _wrap_Grid_HideCellEditControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SaveEditControlValue", (PyCFunction) _wrap_Grid_SaveEditControlValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_XYToCell", (PyCFunction) _wrap_Grid_XYToCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_YToRow", (PyCFunction) _wrap_Grid_YToRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_XToCol", (PyCFunction) _wrap_Grid_XToCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_YToEdgeOfRow", (PyCFunction) _wrap_Grid_YToEdgeOfRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_XToEdgeOfCol", (PyCFunction) _wrap_Grid_XToEdgeOfCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CellToRect", (PyCFunction) _wrap_Grid_CellToRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridCursorRow", (PyCFunction) _wrap_Grid_GetGridCursorRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridCursorCol", (PyCFunction) _wrap_Grid_GetGridCursorCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsVisible", (PyCFunction) _wrap_Grid_IsVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MakeCellVisible", (PyCFunction) _wrap_Grid_MakeCellVisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetGridCursor", (PyCFunction) _wrap_Grid_SetGridCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorUp", (PyCFunction) _wrap_Grid_MoveCursorUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorDown", (PyCFunction) _wrap_Grid_MoveCursorDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorLeft", (PyCFunction) _wrap_Grid_MoveCursorLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorRight", (PyCFunction) _wrap_Grid_MoveCursorRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MovePageDown", (PyCFunction) _wrap_Grid_MovePageDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MovePageUp", (PyCFunction) _wrap_Grid_MovePageUp, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorUpBlock", (PyCFunction) _wrap_Grid_MoveCursorUpBlock, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorDownBlock", (PyCFunction) _wrap_Grid_MoveCursorDownBlock, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorLeftBlock", (PyCFunction) _wrap_Grid_MoveCursorLeftBlock, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_MoveCursorRightBlock", (PyCFunction) _wrap_Grid_MoveCursorRightBlock, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultRowLabelSize", (PyCFunction) _wrap_Grid_GetDefaultRowLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetRowLabelSize", (PyCFunction) _wrap_Grid_GetRowLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultColLabelSize", (PyCFunction) _wrap_Grid_GetDefaultColLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetColLabelSize", (PyCFunction) _wrap_Grid_GetColLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetLabelBackgroundColour", (PyCFunction) _wrap_Grid_GetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetLabelTextColour", (PyCFunction) _wrap_Grid_GetLabelTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetLabelFont", (PyCFunction) _wrap_Grid_GetLabelFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetRowLabelAlignment", (PyCFunction) _wrap_Grid_GetRowLabelAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetColLabelAlignment", (PyCFunction) _wrap_Grid_GetColLabelAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetColLabelTextOrientation", (PyCFunction) _wrap_Grid_GetColLabelTextOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetRowLabelValue", (PyCFunction) _wrap_Grid_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetColLabelValue", (PyCFunction) _wrap_Grid_GetColLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridLineColour", (PyCFunction) _wrap_Grid_GetGridLineColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellHighlightColour", (PyCFunction) _wrap_Grid_GetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellHighlightPenWidth", (PyCFunction) _wrap_Grid_GetCellHighlightPenWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellHighlightROPenWidth", (PyCFunction) _wrap_Grid_GetCellHighlightROPenWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowLabelSize", (PyCFunction) _wrap_Grid_SetRowLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColLabelSize", (PyCFunction) _wrap_Grid_SetColLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetLabelBackgroundColour", (PyCFunction) _wrap_Grid_SetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetLabelTextColour", (PyCFunction) _wrap_Grid_SetLabelTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetLabelFont", (PyCFunction) _wrap_Grid_SetLabelFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowLabelAlignment", (PyCFunction) _wrap_Grid_SetRowLabelAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColLabelAlignment", (PyCFunction) _wrap_Grid_SetColLabelAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColLabelTextOrientation", (PyCFunction) _wrap_Grid_SetColLabelTextOrientation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowLabelValue", (PyCFunction) _wrap_Grid_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColLabelValue", (PyCFunction) _wrap_Grid_SetColLabelValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetGridLineColour", (PyCFunction) _wrap_Grid_SetGridLineColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellHighlightColour", (PyCFunction) _wrap_Grid_SetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellHighlightPenWidth", (PyCFunction) _wrap_Grid_SetCellHighlightPenWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellHighlightROPenWidth", (PyCFunction) _wrap_Grid_SetCellHighlightROPenWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableDragRowSize", (PyCFunction) _wrap_Grid_EnableDragRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DisableDragRowSize", (PyCFunction) _wrap_Grid_DisableDragRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CanDragRowSize", (PyCFunction) _wrap_Grid_CanDragRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableDragColSize", (PyCFunction) _wrap_Grid_EnableDragColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DisableDragColSize", (PyCFunction) _wrap_Grid_DisableDragColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CanDragColSize", (PyCFunction) _wrap_Grid_CanDragColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableDragGridSize", (PyCFunction) _wrap_Grid_EnableDragGridSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DisableDragGridSize", (PyCFunction) _wrap_Grid_DisableDragGridSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CanDragGridSize", (PyCFunction) _wrap_Grid_CanDragGridSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableDragCell", (PyCFunction) _wrap_Grid_EnableDragCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DisableDragCell", (PyCFunction) _wrap_Grid_DisableDragCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_CanDragCell", (PyCFunction) _wrap_Grid_CanDragCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetAttr", (PyCFunction) _wrap_Grid_SetAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowAttr", (PyCFunction) _wrap_Grid_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColAttr", (PyCFunction) _wrap_Grid_SetColAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetOrCreateCellAttr", (PyCFunction) _wrap_Grid_GetOrCreateCellAttr, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColFormatBool", (PyCFunction) _wrap_Grid_SetColFormatBool, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColFormatNumber", (PyCFunction) _wrap_Grid_SetColFormatNumber, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColFormatFloat", (PyCFunction) _wrap_Grid_SetColFormatFloat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColFormatCustom", (PyCFunction) _wrap_Grid_SetColFormatCustom, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_EnableGridLines", (PyCFunction) _wrap_Grid_EnableGridLines, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GridLinesEnabled", (PyCFunction) _wrap_Grid_GridLinesEnabled, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultRowSize", (PyCFunction) _wrap_Grid_GetDefaultRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetRowSize", (PyCFunction) _wrap_Grid_GetRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultColSize", (PyCFunction) _wrap_Grid_GetDefaultColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetColSize", (PyCFunction) _wrap_Grid_GetColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultCellBackgroundColour", (PyCFunction) _wrap_Grid_GetDefaultCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellBackgroundColour", (PyCFunction) _wrap_Grid_GetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultCellTextColour", (PyCFunction) _wrap_Grid_GetDefaultCellTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellTextColour", (PyCFunction) _wrap_Grid_GetCellTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultCellFont", (PyCFunction) _wrap_Grid_GetDefaultCellFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellFont", (PyCFunction) _wrap_Grid_GetCellFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultCellAlignment", (PyCFunction) _wrap_Grid_GetDefaultCellAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellAlignment", (PyCFunction) _wrap_Grid_GetCellAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultCellOverflow", (PyCFunction) _wrap_Grid_GetDefaultCellOverflow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellOverflow", (PyCFunction) _wrap_Grid_GetCellOverflow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellSize", (PyCFunction) _wrap_Grid_GetCellSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultRowSize", (PyCFunction) _wrap_Grid_SetDefaultRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowSize", (PyCFunction) _wrap_Grid_SetRowSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultColSize", (PyCFunction) _wrap_Grid_SetDefaultColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColSize", (PyCFunction) _wrap_Grid_SetColSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSizeColumn", (PyCFunction) _wrap_Grid_AutoSizeColumn, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSizeRow", (PyCFunction) _wrap_Grid_AutoSizeRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSizeColumns", (PyCFunction) _wrap_Grid_AutoSizeColumns, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSizeRows", (PyCFunction) _wrap_Grid_AutoSizeRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSize", (PyCFunction) _wrap_Grid_AutoSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSizeRowLabelSize", (PyCFunction) _wrap_Grid_AutoSizeRowLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_AutoSizeColLabelSize", (PyCFunction) _wrap_Grid_AutoSizeColLabelSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColMinimalWidth", (PyCFunction) _wrap_Grid_SetColMinimalWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowMinimalHeight", (PyCFunction) _wrap_Grid_SetRowMinimalHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetColMinimalAcceptableWidth", (PyCFunction) _wrap_Grid_SetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetRowMinimalAcceptableHeight", (PyCFunction) _wrap_Grid_SetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetColMinimalAcceptableWidth", (PyCFunction) _wrap_Grid_GetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetRowMinimalAcceptableHeight", (PyCFunction) _wrap_Grid_GetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultCellBackgroundColour", (PyCFunction) _wrap_Grid_SetDefaultCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellBackgroundColour", (PyCFunction) _wrap_Grid_SetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultCellTextColour", (PyCFunction) _wrap_Grid_SetDefaultCellTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellTextColour", (PyCFunction) _wrap_Grid_SetCellTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultCellFont", (PyCFunction) _wrap_Grid_SetDefaultCellFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellFont", (PyCFunction) _wrap_Grid_SetCellFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultCellAlignment", (PyCFunction) _wrap_Grid_SetDefaultCellAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellAlignment", (PyCFunction) _wrap_Grid_SetCellAlignment, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultCellOverflow", (PyCFunction) _wrap_Grid_SetDefaultCellOverflow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellOverflow", (PyCFunction) _wrap_Grid_SetCellOverflow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellSize", (PyCFunction) _wrap_Grid_SetCellSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultRenderer", (PyCFunction) _wrap_Grid_SetDefaultRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellRenderer", (PyCFunction) _wrap_Grid_SetCellRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultRenderer", (PyCFunction) _wrap_Grid_GetDefaultRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellRenderer", (PyCFunction) _wrap_Grid_GetCellRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetDefaultEditor", (PyCFunction) _wrap_Grid_SetDefaultEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellEditor", (PyCFunction) _wrap_Grid_SetCellEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultEditor", (PyCFunction) _wrap_Grid_GetDefaultEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellEditor", (PyCFunction) _wrap_Grid_GetCellEditor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetCellValue", (PyCFunction) _wrap_Grid_GetCellValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetCellValue", (PyCFunction) _wrap_Grid_SetCellValue, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsReadOnly", (PyCFunction) _wrap_Grid_IsReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetReadOnly", (PyCFunction) _wrap_Grid_SetReadOnly, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SelectRow", (PyCFunction) _wrap_Grid_SelectRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SelectCol", (PyCFunction) _wrap_Grid_SelectCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SelectBlock", (PyCFunction) _wrap_Grid_SelectBlock, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SelectAll", (PyCFunction) _wrap_Grid_SelectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsSelection", (PyCFunction) _wrap_Grid_IsSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_ClearSelection", (PyCFunction) _wrap_Grid_ClearSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_IsInSelection", (PyCFunction) _wrap_Grid_IsInSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectedCells", (PyCFunction) _wrap_Grid_GetSelectedCells, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectionBlockTopLeft", (PyCFunction) _wrap_Grid_GetSelectionBlockTopLeft, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectionBlockBottomRight", (PyCFunction) _wrap_Grid_GetSelectionBlockBottomRight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectedRows", (PyCFunction) _wrap_Grid_GetSelectedRows, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectedCols", (PyCFunction) _wrap_Grid_GetSelectedCols, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DeselectRow", (PyCFunction) _wrap_Grid_DeselectRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DeselectCol", (PyCFunction) _wrap_Grid_DeselectCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_DeselectCell", (PyCFunction) _wrap_Grid_DeselectCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_BlockToDeviceRect", (PyCFunction) _wrap_Grid_BlockToDeviceRect, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectionBackground", (PyCFunction) _wrap_Grid_GetSelectionBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetSelectionForeground", (PyCFunction) _wrap_Grid_GetSelectionForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetSelectionBackground", (PyCFunction) _wrap_Grid_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetSelectionForeground", (PyCFunction) _wrap_Grid_SetSelectionForeground, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_RegisterDataType", (PyCFunction) _wrap_Grid_RegisterDataType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultEditorForCell", (PyCFunction) _wrap_Grid_GetDefaultEditorForCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultRendererForCell", (PyCFunction) _wrap_Grid_GetDefaultRendererForCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultEditorForType", (PyCFunction) _wrap_Grid_GetDefaultEditorForType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetDefaultRendererForType", (PyCFunction) _wrap_Grid_GetDefaultRendererForType, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_SetMargins", (PyCFunction) _wrap_Grid_SetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridWindow", (PyCFunction) _wrap_Grid_GetGridWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridRowLabelWindow", (PyCFunction) _wrap_Grid_GetGridRowLabelWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridColLabelWindow", (PyCFunction) _wrap_Grid_GetGridColLabelWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetGridCornerLabelWindow", (PyCFunction) _wrap_Grid_GetGridCornerLabelWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_GetClassDefaultAttributes", (PyCFunction) _wrap_Grid_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Grid_swigregister", Grid_swigregister, METH_VARARGS },
-        { (char *)"new_GridEvent", (PyCFunction) _wrap_new_GridEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_GetRow", (PyCFunction) _wrap_GridEvent_GetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_GetCol", (PyCFunction) _wrap_GridEvent_GetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_GetPosition", (PyCFunction) _wrap_GridEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_Selecting", (PyCFunction) _wrap_GridEvent_Selecting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_ControlDown", (PyCFunction) _wrap_GridEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_MetaDown", (PyCFunction) _wrap_GridEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_ShiftDown", (PyCFunction) _wrap_GridEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_AltDown", (PyCFunction) _wrap_GridEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS },
-        { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_GetRowOrCol", (PyCFunction) _wrap_GridSizeEvent_GetRowOrCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_GetPosition", (PyCFunction) _wrap_GridSizeEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_ControlDown", (PyCFunction) _wrap_GridSizeEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_MetaDown", (PyCFunction) _wrap_GridSizeEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_ShiftDown", (PyCFunction) _wrap_GridSizeEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_AltDown", (PyCFunction) _wrap_GridSizeEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS },
-        { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_GetTopLeftCoords", (PyCFunction) _wrap_GridRangeSelectEvent_GetTopLeftCoords, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_GetBottomRightCoords", (PyCFunction) _wrap_GridRangeSelectEvent_GetBottomRightCoords, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_GetTopRow", (PyCFunction) _wrap_GridRangeSelectEvent_GetTopRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_GetBottomRow", (PyCFunction) _wrap_GridRangeSelectEvent_GetBottomRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_GetLeftCol", (PyCFunction) _wrap_GridRangeSelectEvent_GetLeftCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_GetRightCol", (PyCFunction) _wrap_GridRangeSelectEvent_GetRightCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_Selecting", (PyCFunction) _wrap_GridRangeSelectEvent_Selecting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_ControlDown", (PyCFunction) _wrap_GridRangeSelectEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction) _wrap_GridRangeSelectEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction) _wrap_GridRangeSelectEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction) _wrap_GridRangeSelectEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS },
-        { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_GetRow", (PyCFunction) _wrap_GridEditorCreatedEvent_GetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_GetCol", (PyCFunction) _wrap_GridEditorCreatedEvent_GetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_GetControl", (PyCFunction) _wrap_GridEditorCreatedEvent_GetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_SetRow", (PyCFunction) _wrap_GridEditorCreatedEvent_SetRow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_SetCol", (PyCFunction) _wrap_GridEditorCreatedEvent_SetCol, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_SetControl", (PyCFunction) _wrap_GridEditorCreatedEvent_SetControl, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"GridEditorCreatedEvent_swigregister", GridEditorCreatedEvent_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"GridCellRenderer__setOORInfo", (PyCFunction) _wrap_GridCellRenderer__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_SetParameters", (PyCFunction) _wrap_GridCellRenderer_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_IncRef", (PyCFunction) _wrap_GridCellRenderer_IncRef, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_DecRef", (PyCFunction) _wrap_GridCellRenderer_DecRef, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_Draw", (PyCFunction) _wrap_GridCellRenderer_Draw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_GetBestSize", (PyCFunction) _wrap_GridCellRenderer_GetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_Clone", (PyCFunction) _wrap_GridCellRenderer_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellRenderer_swigregister", GridCellRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyGridCellRenderer", (PyCFunction) _wrap_new_PyGridCellRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellRenderer__setCallbackInfo", (PyCFunction) _wrap_PyGridCellRenderer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellRenderer_base_SetParameters", (PyCFunction) _wrap_PyGridCellRenderer_base_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellRenderer_swigregister", PyGridCellRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellStringRenderer", (PyCFunction) _wrap_new_GridCellStringRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellStringRenderer_swigregister", GridCellStringRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellNumberRenderer", (PyCFunction) _wrap_new_GridCellNumberRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellNumberRenderer_swigregister", GridCellNumberRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellFloatRenderer", (PyCFunction) _wrap_new_GridCellFloatRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatRenderer_GetWidth", (PyCFunction) _wrap_GridCellFloatRenderer_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatRenderer_SetWidth", (PyCFunction) _wrap_GridCellFloatRenderer_SetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatRenderer_GetPrecision", (PyCFunction) _wrap_GridCellFloatRenderer_GetPrecision, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatRenderer_SetPrecision", (PyCFunction) _wrap_GridCellFloatRenderer_SetPrecision, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatRenderer_swigregister", GridCellFloatRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellBoolRenderer", (PyCFunction) _wrap_new_GridCellBoolRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellBoolRenderer_swigregister", GridCellBoolRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellDateTimeRenderer", (PyCFunction) _wrap_new_GridCellDateTimeRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellDateTimeRenderer_swigregister", GridCellDateTimeRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellEnumRenderer", (PyCFunction) _wrap_new_GridCellEnumRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEnumRenderer_swigregister", GridCellEnumRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellAutoWrapStringRenderer", (PyCFunction) _wrap_new_GridCellAutoWrapStringRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAutoWrapStringRenderer_swigregister", GridCellAutoWrapStringRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"GridCellEditor__setOORInfo", (PyCFunction) _wrap_GridCellEditor__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_IsCreated", (PyCFunction) _wrap_GridCellEditor_IsCreated, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_GetControl", (PyCFunction) _wrap_GridCellEditor_GetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_SetControl", (PyCFunction) _wrap_GridCellEditor_SetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_GetCellAttr", (PyCFunction) _wrap_GridCellEditor_GetCellAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_SetCellAttr", (PyCFunction) _wrap_GridCellEditor_SetCellAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_SetParameters", (PyCFunction) _wrap_GridCellEditor_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_IncRef", (PyCFunction) _wrap_GridCellEditor_IncRef, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_DecRef", (PyCFunction) _wrap_GridCellEditor_DecRef, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_Create", (PyCFunction) _wrap_GridCellEditor_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_BeginEdit", (PyCFunction) _wrap_GridCellEditor_BeginEdit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_EndEdit", (PyCFunction) _wrap_GridCellEditor_EndEdit, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_Reset", (PyCFunction) _wrap_GridCellEditor_Reset, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_Clone", (PyCFunction) _wrap_GridCellEditor_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_SetSize", (PyCFunction) _wrap_GridCellEditor_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_Show", (PyCFunction) _wrap_GridCellEditor_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_PaintBackground", (PyCFunction) _wrap_GridCellEditor_PaintBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_IsAcceptedKey", (PyCFunction) _wrap_GridCellEditor_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_StartingKey", (PyCFunction) _wrap_GridCellEditor_StartingKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_StartingClick", (PyCFunction) _wrap_GridCellEditor_StartingClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_HandleReturn", (PyCFunction) _wrap_GridCellEditor_HandleReturn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_Destroy", (PyCFunction) _wrap_GridCellEditor_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEditor_swigregister", GridCellEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyGridCellEditor", (PyCFunction) _wrap_new_PyGridCellEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor__setCallbackInfo", (PyCFunction) _wrap_PyGridCellEditor__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_SetSize", (PyCFunction) _wrap_PyGridCellEditor_base_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_Show", (PyCFunction) _wrap_PyGridCellEditor_base_Show, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_PaintBackground", (PyCFunction) _wrap_PyGridCellEditor_base_PaintBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_IsAcceptedKey", (PyCFunction) _wrap_PyGridCellEditor_base_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_StartingKey", (PyCFunction) _wrap_PyGridCellEditor_base_StartingKey, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_StartingClick", (PyCFunction) _wrap_PyGridCellEditor_base_StartingClick, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_HandleReturn", (PyCFunction) _wrap_PyGridCellEditor_base_HandleReturn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_Destroy", (PyCFunction) _wrap_PyGridCellEditor_base_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_base_SetParameters", (PyCFunction) _wrap_PyGridCellEditor_base_SetParameters, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellEditor_swigregister", PyGridCellEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellTextEditor", (PyCFunction) _wrap_new_GridCellTextEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellTextEditor_GetValue", (PyCFunction) _wrap_GridCellTextEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellTextEditor_swigregister", GridCellTextEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellNumberEditor", (PyCFunction) _wrap_new_GridCellNumberEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellNumberEditor_GetValue", (PyCFunction) _wrap_GridCellNumberEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellNumberEditor_swigregister", GridCellNumberEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellFloatEditor", (PyCFunction) _wrap_new_GridCellFloatEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatEditor_GetValue", (PyCFunction) _wrap_GridCellFloatEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellFloatEditor_swigregister", GridCellFloatEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellBoolEditor", (PyCFunction) _wrap_new_GridCellBoolEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellBoolEditor_GetValue", (PyCFunction) _wrap_GridCellBoolEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellBoolEditor_swigregister", GridCellBoolEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellChoiceEditor", (PyCFunction) _wrap_new_GridCellChoiceEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellChoiceEditor_GetValue", (PyCFunction) _wrap_GridCellChoiceEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellChoiceEditor_swigregister", GridCellChoiceEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellEnumEditor", (PyCFunction) _wrap_new_GridCellEnumEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEnumEditor_GetValue", (PyCFunction) _wrap_GridCellEnumEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellEnumEditor_swigregister", GridCellEnumEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellAutoWrapStringEditor", (PyCFunction) _wrap_new_GridCellAutoWrapStringEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAutoWrapStringEditor_GetValue", (PyCFunction) _wrap_GridCellAutoWrapStringEditor_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAutoWrapStringEditor_swigregister", GridCellAutoWrapStringEditor_swigregister, METH_VARARGS, NULL },
+        { (char *)"GridCellAttr__setOORInfo", (PyCFunction) _wrap_GridCellAttr__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_GridCellAttr", (PyCFunction) _wrap_new_GridCellAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_Clone", (PyCFunction) _wrap_GridCellAttr_Clone, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_MergeWith", (PyCFunction) _wrap_GridCellAttr_MergeWith, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_IncRef", (PyCFunction) _wrap_GridCellAttr_IncRef, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_DecRef", (PyCFunction) _wrap_GridCellAttr_DecRef, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetTextColour", (PyCFunction) _wrap_GridCellAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetBackgroundColour", (PyCFunction) _wrap_GridCellAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetFont", (PyCFunction) _wrap_GridCellAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetAlignment", (PyCFunction) _wrap_GridCellAttr_SetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetSize", (PyCFunction) _wrap_GridCellAttr_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetOverflow", (PyCFunction) _wrap_GridCellAttr_SetOverflow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetReadOnly", (PyCFunction) _wrap_GridCellAttr_SetReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetRenderer", (PyCFunction) _wrap_GridCellAttr_SetRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetEditor", (PyCFunction) _wrap_GridCellAttr_SetEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetKind", (PyCFunction) _wrap_GridCellAttr_SetKind, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasTextColour", (PyCFunction) _wrap_GridCellAttr_HasTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasBackgroundColour", (PyCFunction) _wrap_GridCellAttr_HasBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasFont", (PyCFunction) _wrap_GridCellAttr_HasFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasAlignment", (PyCFunction) _wrap_GridCellAttr_HasAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasRenderer", (PyCFunction) _wrap_GridCellAttr_HasRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasEditor", (PyCFunction) _wrap_GridCellAttr_HasEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasReadWriteMode", (PyCFunction) _wrap_GridCellAttr_HasReadWriteMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_HasOverflowMode", (PyCFunction) _wrap_GridCellAttr_HasOverflowMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetTextColour", (PyCFunction) _wrap_GridCellAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetBackgroundColour", (PyCFunction) _wrap_GridCellAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetFont", (PyCFunction) _wrap_GridCellAttr_GetFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetAlignment", (PyCFunction) _wrap_GridCellAttr_GetAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetSize", (PyCFunction) _wrap_GridCellAttr_GetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetOverflow", (PyCFunction) _wrap_GridCellAttr_GetOverflow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetRenderer", (PyCFunction) _wrap_GridCellAttr_GetRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetEditor", (PyCFunction) _wrap_GridCellAttr_GetEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_IsReadOnly", (PyCFunction) _wrap_GridCellAttr_IsReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_GetKind", (PyCFunction) _wrap_GridCellAttr_GetKind, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_SetDefAttr", (PyCFunction) _wrap_GridCellAttr_SetDefAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttr_swigregister", GridCellAttr_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellAttrProvider", (PyCFunction) _wrap_new_GridCellAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider__setOORInfo", (PyCFunction) _wrap_GridCellAttrProvider__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_GetAttr", (PyCFunction) _wrap_GridCellAttrProvider_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_SetAttr", (PyCFunction) _wrap_GridCellAttrProvider_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_SetRowAttr", (PyCFunction) _wrap_GridCellAttrProvider_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_GridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_UpdateAttrRows", (PyCFunction) _wrap_GridCellAttrProvider_UpdateAttrRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_UpdateAttrCols", (PyCFunction) _wrap_GridCellAttrProvider_UpdateAttrCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellAttrProvider_swigregister", GridCellAttrProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyGridCellAttrProvider", (PyCFunction) _wrap_new_PyGridCellAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellAttrProvider__setCallbackInfo", (PyCFunction) _wrap_PyGridCellAttrProvider__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellAttrProvider_base_GetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellAttrProvider_base_SetAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellAttrProvider_base_SetRowAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellAttrProvider_base_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_base_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL },
+        { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetAttrProvider", (PyCFunction) _wrap_GridTableBase_GetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetView", (PyCFunction) _wrap_GridTableBase_SetView, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetView", (PyCFunction) _wrap_GridTableBase_GetView, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetNumberRows", (PyCFunction) _wrap_GridTableBase_GetNumberRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetNumberCols", (PyCFunction) _wrap_GridTableBase_GetNumberCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_IsEmptyCell", (PyCFunction) _wrap_GridTableBase_IsEmptyCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetValue", (PyCFunction) _wrap_GridTableBase_GetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetValue", (PyCFunction) _wrap_GridTableBase_SetValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetTypeName", (PyCFunction) _wrap_GridTableBase_GetTypeName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_CanGetValueAs", (PyCFunction) _wrap_GridTableBase_CanGetValueAs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_CanSetValueAs", (PyCFunction) _wrap_GridTableBase_CanSetValueAs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetValueAsLong", (PyCFunction) _wrap_GridTableBase_GetValueAsLong, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetValueAsDouble", (PyCFunction) _wrap_GridTableBase_GetValueAsDouble, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetValueAsBool", (PyCFunction) _wrap_GridTableBase_GetValueAsBool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetValueAsLong", (PyCFunction) _wrap_GridTableBase_SetValueAsLong, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetValueAsDouble", (PyCFunction) _wrap_GridTableBase_SetValueAsDouble, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetValueAsBool", (PyCFunction) _wrap_GridTableBase_SetValueAsBool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_Clear", (PyCFunction) _wrap_GridTableBase_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_InsertRows", (PyCFunction) _wrap_GridTableBase_InsertRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_AppendRows", (PyCFunction) _wrap_GridTableBase_AppendRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_DeleteRows", (PyCFunction) _wrap_GridTableBase_DeleteRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_InsertCols", (PyCFunction) _wrap_GridTableBase_InsertCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_AppendCols", (PyCFunction) _wrap_GridTableBase_AppendCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_DeleteCols", (PyCFunction) _wrap_GridTableBase_DeleteCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetRowLabelValue", (PyCFunction) _wrap_GridTableBase_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetColLabelValue", (PyCFunction) _wrap_GridTableBase_GetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetRowLabelValue", (PyCFunction) _wrap_GridTableBase_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetColLabelValue", (PyCFunction) _wrap_GridTableBase_SetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_CanHaveAttributes", (PyCFunction) _wrap_GridTableBase_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_GetAttr", (PyCFunction) _wrap_GridTableBase_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetAttr", (PyCFunction) _wrap_GridTableBase_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetRowAttr", (PyCFunction) _wrap_GridTableBase_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_SetColAttr", (PyCFunction) _wrap_GridTableBase_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableBase_swigregister", GridTableBase_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyGridTableBase", (PyCFunction) _wrap_new_PyGridTableBase, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase__setCallbackInfo", (PyCFunction) _wrap_PyGridTableBase__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_Destroy", (PyCFunction) _wrap_PyGridTableBase_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_GetTypeName", (PyCFunction) _wrap_PyGridTableBase_base_GetTypeName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_CanGetValueAs", (PyCFunction) _wrap_PyGridTableBase_base_CanGetValueAs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_CanSetValueAs", (PyCFunction) _wrap_PyGridTableBase_base_CanSetValueAs, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_Clear", (PyCFunction) _wrap_PyGridTableBase_base_Clear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_InsertRows", (PyCFunction) _wrap_PyGridTableBase_base_InsertRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_AppendRows", (PyCFunction) _wrap_PyGridTableBase_base_AppendRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_DeleteRows", (PyCFunction) _wrap_PyGridTableBase_base_DeleteRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_InsertCols", (PyCFunction) _wrap_PyGridTableBase_base_InsertCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_AppendCols", (PyCFunction) _wrap_PyGridTableBase_base_AppendCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_DeleteCols", (PyCFunction) _wrap_PyGridTableBase_base_DeleteCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_GetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_GetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_GetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_SetRowLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_SetColLabelValue", (PyCFunction) _wrap_PyGridTableBase_base_SetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_CanHaveAttributes", (PyCFunction) _wrap_PyGridTableBase_base_CanHaveAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_GetAttr", (PyCFunction) _wrap_PyGridTableBase_base_GetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_SetAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_SetRowAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_base_SetColAttr", (PyCFunction) _wrap_PyGridTableBase_base_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyGridTableBase_swigregister", PyGridTableBase_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridStringTable", (PyCFunction) _wrap_new_GridStringTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridStringTable_swigregister", GridStringTable_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridTableMessage", (PyCFunction) _wrap_new_GridTableMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_GridTableMessage", (PyCFunction) _wrap_delete_GridTableMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_SetTableObject", (PyCFunction) _wrap_GridTableMessage_SetTableObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_GetTableObject", (PyCFunction) _wrap_GridTableMessage_GetTableObject, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_SetId", (PyCFunction) _wrap_GridTableMessage_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_GetId", (PyCFunction) _wrap_GridTableMessage_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_SetCommandInt", (PyCFunction) _wrap_GridTableMessage_SetCommandInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_GetCommandInt", (PyCFunction) _wrap_GridTableMessage_GetCommandInt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_SetCommandInt2", (PyCFunction) _wrap_GridTableMessage_SetCommandInt2, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_GetCommandInt2", (PyCFunction) _wrap_GridTableMessage_GetCommandInt2, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridTableMessage_swigregister", GridTableMessage_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridCellCoords", (PyCFunction) _wrap_new_GridCellCoords, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_GridCellCoords", (PyCFunction) _wrap_delete_GridCellCoords, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_GetRow", (PyCFunction) _wrap_GridCellCoords_GetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_SetRow", (PyCFunction) _wrap_GridCellCoords_SetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_GetCol", (PyCFunction) _wrap_GridCellCoords_GetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_SetCol", (PyCFunction) _wrap_GridCellCoords_SetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_Set", (PyCFunction) _wrap_GridCellCoords_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords___eq__", (PyCFunction) _wrap_GridCellCoords___eq__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords___ne__", (PyCFunction) _wrap_GridCellCoords___ne__, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_Get", (PyCFunction) _wrap_GridCellCoords_Get, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridCellCoords_swigregister", GridCellCoords_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Grid", (PyCFunction) _wrap_new_Grid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreGrid", (PyCFunction) _wrap_new_PreGrid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_Create", (PyCFunction) _wrap_Grid_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CreateGrid", (PyCFunction) _wrap_Grid_CreateGrid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetSelectionMode", (PyCFunction) _wrap_Grid_SetSelectionMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectionMode", (PyCFunction) _wrap_Grid_GetSelectionMode, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetNumberRows", (PyCFunction) _wrap_Grid_GetNumberRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetNumberCols", (PyCFunction) _wrap_Grid_GetNumberCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_ProcessTableMessage", (PyCFunction) _wrap_Grid_ProcessTableMessage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetTable", (PyCFunction) _wrap_Grid_GetTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetTable", (PyCFunction) _wrap_Grid_SetTable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_ClearGrid", (PyCFunction) _wrap_Grid_ClearGrid, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_InsertRows", (PyCFunction) _wrap_Grid_InsertRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AppendRows", (PyCFunction) _wrap_Grid_AppendRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DeleteRows", (PyCFunction) _wrap_Grid_DeleteRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_InsertCols", (PyCFunction) _wrap_Grid_InsertCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AppendCols", (PyCFunction) _wrap_Grid_AppendCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DeleteCols", (PyCFunction) _wrap_Grid_DeleteCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DrawCellHighlight", (PyCFunction) _wrap_Grid_DrawCellHighlight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DrawTextRectangle", (PyCFunction) _wrap_Grid_DrawTextRectangle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetTextBoxSize", (PyCFunction) _wrap_Grid_GetTextBoxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_BeginBatch", (PyCFunction) _wrap_Grid_BeginBatch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EndBatch", (PyCFunction) _wrap_Grid_EndBatch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetBatchCount", (PyCFunction) _wrap_Grid_GetBatchCount, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_ForceRefresh", (PyCFunction) _wrap_Grid_ForceRefresh, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsEditable", (PyCFunction) _wrap_Grid_IsEditable, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableEditing", (PyCFunction) _wrap_Grid_EnableEditing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableCellEditControl", (PyCFunction) _wrap_Grid_EnableCellEditControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DisableCellEditControl", (PyCFunction) _wrap_Grid_DisableCellEditControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CanEnableCellControl", (PyCFunction) _wrap_Grid_CanEnableCellControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsCellEditControlEnabled", (PyCFunction) _wrap_Grid_IsCellEditControlEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsCellEditControlShown", (PyCFunction) _wrap_Grid_IsCellEditControlShown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsCurrentCellReadOnly", (PyCFunction) _wrap_Grid_IsCurrentCellReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_ShowCellEditControl", (PyCFunction) _wrap_Grid_ShowCellEditControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_HideCellEditControl", (PyCFunction) _wrap_Grid_HideCellEditControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SaveEditControlValue", (PyCFunction) _wrap_Grid_SaveEditControlValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_XYToCell", (PyCFunction) _wrap_Grid_XYToCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_YToRow", (PyCFunction) _wrap_Grid_YToRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_XToCol", (PyCFunction) _wrap_Grid_XToCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_YToEdgeOfRow", (PyCFunction) _wrap_Grid_YToEdgeOfRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_XToEdgeOfCol", (PyCFunction) _wrap_Grid_XToEdgeOfCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CellToRect", (PyCFunction) _wrap_Grid_CellToRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridCursorRow", (PyCFunction) _wrap_Grid_GetGridCursorRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridCursorCol", (PyCFunction) _wrap_Grid_GetGridCursorCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsVisible", (PyCFunction) _wrap_Grid_IsVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MakeCellVisible", (PyCFunction) _wrap_Grid_MakeCellVisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetGridCursor", (PyCFunction) _wrap_Grid_SetGridCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorUp", (PyCFunction) _wrap_Grid_MoveCursorUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorDown", (PyCFunction) _wrap_Grid_MoveCursorDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorLeft", (PyCFunction) _wrap_Grid_MoveCursorLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorRight", (PyCFunction) _wrap_Grid_MoveCursorRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MovePageDown", (PyCFunction) _wrap_Grid_MovePageDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MovePageUp", (PyCFunction) _wrap_Grid_MovePageUp, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorUpBlock", (PyCFunction) _wrap_Grid_MoveCursorUpBlock, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorDownBlock", (PyCFunction) _wrap_Grid_MoveCursorDownBlock, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorLeftBlock", (PyCFunction) _wrap_Grid_MoveCursorLeftBlock, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_MoveCursorRightBlock", (PyCFunction) _wrap_Grid_MoveCursorRightBlock, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultRowLabelSize", (PyCFunction) _wrap_Grid_GetDefaultRowLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetRowLabelSize", (PyCFunction) _wrap_Grid_GetRowLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultColLabelSize", (PyCFunction) _wrap_Grid_GetDefaultColLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetColLabelSize", (PyCFunction) _wrap_Grid_GetColLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetLabelBackgroundColour", (PyCFunction) _wrap_Grid_GetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetLabelTextColour", (PyCFunction) _wrap_Grid_GetLabelTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetLabelFont", (PyCFunction) _wrap_Grid_GetLabelFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetRowLabelAlignment", (PyCFunction) _wrap_Grid_GetRowLabelAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetColLabelAlignment", (PyCFunction) _wrap_Grid_GetColLabelAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetColLabelTextOrientation", (PyCFunction) _wrap_Grid_GetColLabelTextOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetRowLabelValue", (PyCFunction) _wrap_Grid_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetColLabelValue", (PyCFunction) _wrap_Grid_GetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridLineColour", (PyCFunction) _wrap_Grid_GetGridLineColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellHighlightColour", (PyCFunction) _wrap_Grid_GetCellHighlightColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellHighlightPenWidth", (PyCFunction) _wrap_Grid_GetCellHighlightPenWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellHighlightROPenWidth", (PyCFunction) _wrap_Grid_GetCellHighlightROPenWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowLabelSize", (PyCFunction) _wrap_Grid_SetRowLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColLabelSize", (PyCFunction) _wrap_Grid_SetColLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetLabelBackgroundColour", (PyCFunction) _wrap_Grid_SetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetLabelTextColour", (PyCFunction) _wrap_Grid_SetLabelTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetLabelFont", (PyCFunction) _wrap_Grid_SetLabelFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowLabelAlignment", (PyCFunction) _wrap_Grid_SetRowLabelAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColLabelAlignment", (PyCFunction) _wrap_Grid_SetColLabelAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColLabelTextOrientation", (PyCFunction) _wrap_Grid_SetColLabelTextOrientation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowLabelValue", (PyCFunction) _wrap_Grid_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColLabelValue", (PyCFunction) _wrap_Grid_SetColLabelValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetGridLineColour", (PyCFunction) _wrap_Grid_SetGridLineColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellHighlightColour", (PyCFunction) _wrap_Grid_SetCellHighlightColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellHighlightPenWidth", (PyCFunction) _wrap_Grid_SetCellHighlightPenWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellHighlightROPenWidth", (PyCFunction) _wrap_Grid_SetCellHighlightROPenWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableDragRowSize", (PyCFunction) _wrap_Grid_EnableDragRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DisableDragRowSize", (PyCFunction) _wrap_Grid_DisableDragRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CanDragRowSize", (PyCFunction) _wrap_Grid_CanDragRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableDragColSize", (PyCFunction) _wrap_Grid_EnableDragColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DisableDragColSize", (PyCFunction) _wrap_Grid_DisableDragColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CanDragColSize", (PyCFunction) _wrap_Grid_CanDragColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableDragGridSize", (PyCFunction) _wrap_Grid_EnableDragGridSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DisableDragGridSize", (PyCFunction) _wrap_Grid_DisableDragGridSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CanDragGridSize", (PyCFunction) _wrap_Grid_CanDragGridSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableDragCell", (PyCFunction) _wrap_Grid_EnableDragCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DisableDragCell", (PyCFunction) _wrap_Grid_DisableDragCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_CanDragCell", (PyCFunction) _wrap_Grid_CanDragCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetAttr", (PyCFunction) _wrap_Grid_SetAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowAttr", (PyCFunction) _wrap_Grid_SetRowAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColAttr", (PyCFunction) _wrap_Grid_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetOrCreateCellAttr", (PyCFunction) _wrap_Grid_GetOrCreateCellAttr, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColFormatBool", (PyCFunction) _wrap_Grid_SetColFormatBool, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColFormatNumber", (PyCFunction) _wrap_Grid_SetColFormatNumber, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColFormatFloat", (PyCFunction) _wrap_Grid_SetColFormatFloat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColFormatCustom", (PyCFunction) _wrap_Grid_SetColFormatCustom, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_EnableGridLines", (PyCFunction) _wrap_Grid_EnableGridLines, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GridLinesEnabled", (PyCFunction) _wrap_Grid_GridLinesEnabled, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultRowSize", (PyCFunction) _wrap_Grid_GetDefaultRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetRowSize", (PyCFunction) _wrap_Grid_GetRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultColSize", (PyCFunction) _wrap_Grid_GetDefaultColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetColSize", (PyCFunction) _wrap_Grid_GetColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultCellBackgroundColour", (PyCFunction) _wrap_Grid_GetDefaultCellBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellBackgroundColour", (PyCFunction) _wrap_Grid_GetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultCellTextColour", (PyCFunction) _wrap_Grid_GetDefaultCellTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellTextColour", (PyCFunction) _wrap_Grid_GetCellTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultCellFont", (PyCFunction) _wrap_Grid_GetDefaultCellFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellFont", (PyCFunction) _wrap_Grid_GetCellFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultCellAlignment", (PyCFunction) _wrap_Grid_GetDefaultCellAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellAlignment", (PyCFunction) _wrap_Grid_GetCellAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultCellOverflow", (PyCFunction) _wrap_Grid_GetDefaultCellOverflow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellOverflow", (PyCFunction) _wrap_Grid_GetCellOverflow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellSize", (PyCFunction) _wrap_Grid_GetCellSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultRowSize", (PyCFunction) _wrap_Grid_SetDefaultRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowSize", (PyCFunction) _wrap_Grid_SetRowSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultColSize", (PyCFunction) _wrap_Grid_SetDefaultColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColSize", (PyCFunction) _wrap_Grid_SetColSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSizeColumn", (PyCFunction) _wrap_Grid_AutoSizeColumn, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSizeRow", (PyCFunction) _wrap_Grid_AutoSizeRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSizeColumns", (PyCFunction) _wrap_Grid_AutoSizeColumns, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSizeRows", (PyCFunction) _wrap_Grid_AutoSizeRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSize", (PyCFunction) _wrap_Grid_AutoSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSizeRowLabelSize", (PyCFunction) _wrap_Grid_AutoSizeRowLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_AutoSizeColLabelSize", (PyCFunction) _wrap_Grid_AutoSizeColLabelSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColMinimalWidth", (PyCFunction) _wrap_Grid_SetColMinimalWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowMinimalHeight", (PyCFunction) _wrap_Grid_SetRowMinimalHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetColMinimalAcceptableWidth", (PyCFunction) _wrap_Grid_SetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetRowMinimalAcceptableHeight", (PyCFunction) _wrap_Grid_SetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetColMinimalAcceptableWidth", (PyCFunction) _wrap_Grid_GetColMinimalAcceptableWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetRowMinimalAcceptableHeight", (PyCFunction) _wrap_Grid_GetRowMinimalAcceptableHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultCellBackgroundColour", (PyCFunction) _wrap_Grid_SetDefaultCellBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellBackgroundColour", (PyCFunction) _wrap_Grid_SetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultCellTextColour", (PyCFunction) _wrap_Grid_SetDefaultCellTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellTextColour", (PyCFunction) _wrap_Grid_SetCellTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultCellFont", (PyCFunction) _wrap_Grid_SetDefaultCellFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellFont", (PyCFunction) _wrap_Grid_SetCellFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultCellAlignment", (PyCFunction) _wrap_Grid_SetDefaultCellAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellAlignment", (PyCFunction) _wrap_Grid_SetCellAlignment, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultCellOverflow", (PyCFunction) _wrap_Grid_SetDefaultCellOverflow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellOverflow", (PyCFunction) _wrap_Grid_SetCellOverflow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellSize", (PyCFunction) _wrap_Grid_SetCellSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultRenderer", (PyCFunction) _wrap_Grid_SetDefaultRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellRenderer", (PyCFunction) _wrap_Grid_SetCellRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultRenderer", (PyCFunction) _wrap_Grid_GetDefaultRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellRenderer", (PyCFunction) _wrap_Grid_GetCellRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetDefaultEditor", (PyCFunction) _wrap_Grid_SetDefaultEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellEditor", (PyCFunction) _wrap_Grid_SetCellEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultEditor", (PyCFunction) _wrap_Grid_GetDefaultEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellEditor", (PyCFunction) _wrap_Grid_GetCellEditor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetCellValue", (PyCFunction) _wrap_Grid_GetCellValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetCellValue", (PyCFunction) _wrap_Grid_SetCellValue, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsReadOnly", (PyCFunction) _wrap_Grid_IsReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetReadOnly", (PyCFunction) _wrap_Grid_SetReadOnly, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SelectRow", (PyCFunction) _wrap_Grid_SelectRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SelectCol", (PyCFunction) _wrap_Grid_SelectCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SelectBlock", (PyCFunction) _wrap_Grid_SelectBlock, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SelectAll", (PyCFunction) _wrap_Grid_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsSelection", (PyCFunction) _wrap_Grid_IsSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_ClearSelection", (PyCFunction) _wrap_Grid_ClearSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_IsInSelection", (PyCFunction) _wrap_Grid_IsInSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectedCells", (PyCFunction) _wrap_Grid_GetSelectedCells, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectionBlockTopLeft", (PyCFunction) _wrap_Grid_GetSelectionBlockTopLeft, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectionBlockBottomRight", (PyCFunction) _wrap_Grid_GetSelectionBlockBottomRight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectedRows", (PyCFunction) _wrap_Grid_GetSelectedRows, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectedCols", (PyCFunction) _wrap_Grid_GetSelectedCols, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DeselectRow", (PyCFunction) _wrap_Grid_DeselectRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DeselectCol", (PyCFunction) _wrap_Grid_DeselectCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_DeselectCell", (PyCFunction) _wrap_Grid_DeselectCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_BlockToDeviceRect", (PyCFunction) _wrap_Grid_BlockToDeviceRect, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectionBackground", (PyCFunction) _wrap_Grid_GetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetSelectionForeground", (PyCFunction) _wrap_Grid_GetSelectionForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetSelectionBackground", (PyCFunction) _wrap_Grid_SetSelectionBackground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetSelectionForeground", (PyCFunction) _wrap_Grid_SetSelectionForeground, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_RegisterDataType", (PyCFunction) _wrap_Grid_RegisterDataType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultEditorForCell", (PyCFunction) _wrap_Grid_GetDefaultEditorForCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultRendererForCell", (PyCFunction) _wrap_Grid_GetDefaultRendererForCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultEditorForType", (PyCFunction) _wrap_Grid_GetDefaultEditorForType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetDefaultRendererForType", (PyCFunction) _wrap_Grid_GetDefaultRendererForType, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_SetMargins", (PyCFunction) _wrap_Grid_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridWindow", (PyCFunction) _wrap_Grid_GetGridWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridRowLabelWindow", (PyCFunction) _wrap_Grid_GetGridRowLabelWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridColLabelWindow", (PyCFunction) _wrap_Grid_GetGridColLabelWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetGridCornerLabelWindow", (PyCFunction) _wrap_Grid_GetGridCornerLabelWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_GetClassDefaultAttributes", (PyCFunction) _wrap_Grid_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Grid_swigregister", Grid_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridEvent", (PyCFunction) _wrap_new_GridEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_GetRow", (PyCFunction) _wrap_GridEvent_GetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_GetCol", (PyCFunction) _wrap_GridEvent_GetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_GetPosition", (PyCFunction) _wrap_GridEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_Selecting", (PyCFunction) _wrap_GridEvent_Selecting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_ControlDown", (PyCFunction) _wrap_GridEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_MetaDown", (PyCFunction) _wrap_GridEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_ShiftDown", (PyCFunction) _wrap_GridEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_AltDown", (PyCFunction) _wrap_GridEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_GetRowOrCol", (PyCFunction) _wrap_GridSizeEvent_GetRowOrCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_GetPosition", (PyCFunction) _wrap_GridSizeEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_ControlDown", (PyCFunction) _wrap_GridSizeEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_MetaDown", (PyCFunction) _wrap_GridSizeEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_ShiftDown", (PyCFunction) _wrap_GridSizeEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_AltDown", (PyCFunction) _wrap_GridSizeEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_GetTopLeftCoords", (PyCFunction) _wrap_GridRangeSelectEvent_GetTopLeftCoords, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_GetBottomRightCoords", (PyCFunction) _wrap_GridRangeSelectEvent_GetBottomRightCoords, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_GetTopRow", (PyCFunction) _wrap_GridRangeSelectEvent_GetTopRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_GetBottomRow", (PyCFunction) _wrap_GridRangeSelectEvent_GetBottomRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_GetLeftCol", (PyCFunction) _wrap_GridRangeSelectEvent_GetLeftCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_GetRightCol", (PyCFunction) _wrap_GridRangeSelectEvent_GetRightCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_Selecting", (PyCFunction) _wrap_GridRangeSelectEvent_Selecting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_ControlDown", (PyCFunction) _wrap_GridRangeSelectEvent_ControlDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction) _wrap_GridRangeSelectEvent_MetaDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction) _wrap_GridRangeSelectEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction) _wrap_GridRangeSelectEvent_AltDown, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_GetRow", (PyCFunction) _wrap_GridEditorCreatedEvent_GetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_GetCol", (PyCFunction) _wrap_GridEditorCreatedEvent_GetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_GetControl", (PyCFunction) _wrap_GridEditorCreatedEvent_GetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_SetRow", (PyCFunction) _wrap_GridEditorCreatedEvent_SetRow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_SetCol", (PyCFunction) _wrap_GridEditorCreatedEvent_SetCol, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_SetControl", (PyCFunction) _wrap_GridEditorCreatedEvent_SetControl, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"GridEditorCreatedEvent_swigregister", GridEditorCreatedEvent_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -17368,7 +17464,7 @@ static swig_const_info swig_const_table[] = {
 { SWIG_PY_POINTER, (char*)"GRID_VALUE_LONG", 0, 0, (void *)"long", &SWIGTYPE_p_char},
 { SWIG_PY_POINTER, (char*)"GRID_VALUE_CHOICEINT", 0, 0, (void *)"choiceint", &SWIGTYPE_p_char},
 { SWIG_PY_POINTER, (char*)"GRID_VALUE_DATETIME", 0, 0, (void *)"datetime", &SWIGTYPE_p_char},
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -17407,33 +17503,33 @@ SWIGEXPORT(void) SWIG_init(void) {
     PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime"));
     SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set);
     SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set);
-    PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS));
-    PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS));
-    PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT));
-    PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH));
-    PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT));
-    PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH));
-    PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE));
-    PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT));
-    PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH));
-    PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH));
-    PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any));
-    PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default));
-    PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell));
-    PyDict_SetItemString(d,"GridCellAttr_Row", SWIG_FromInt((int)wxGridCellAttr::Row));
-    PyDict_SetItemString(d,"GridCellAttr_Col", SWIG_FromInt((int)wxGridCellAttr::Col));
-    PyDict_SetItemString(d,"GridCellAttr_Merged", SWIG_FromInt((int)wxGridCellAttr::Merged));
-    PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_GET_VALUES", SWIG_FromInt((int)wxGRIDTABLE_REQUEST_VIEW_GET_VALUES));
-    PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_SEND_VALUES", SWIG_FromInt((int)wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES));
-    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_INSERTED", SWIG_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_INSERTED));
-    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_APPENDED", SWIG_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_APPENDED));
-    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_DELETED", SWIG_FromInt((int)wxGRIDTABLE_NOTIFY_ROWS_DELETED));
-    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_INSERTED", SWIG_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_INSERTED));
-    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_APPENDED", SWIG_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_APPENDED));
-    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_DELETED", SWIG_FromInt((int)wxGRIDTABLE_NOTIFY_COLS_DELETED));
-    PyDict_SetItemString(d,"Grid_wxGridSelectCells", SWIG_FromInt((int)wxGrid::wxGridSelectCells));
-    PyDict_SetItemString(d,"Grid_wxGridSelectRows", SWIG_FromInt((int)wxGrid::wxGridSelectRows));
-    PyDict_SetItemString(d,"Grid_wxGridSelectColumns", SWIG_FromInt((int)wxGrid::wxGridSelectColumns));
+    PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_From_int((int)wxGRID_DEFAULT_NUMBER_ROWS));
+    PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_From_int((int)wxGRID_DEFAULT_NUMBER_COLS));
+    PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_From_int((int)wxGRID_DEFAULT_ROW_HEIGHT));
+    PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_From_int((int)wxGRID_DEFAULT_COL_WIDTH));
+    PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_From_int((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT));
+    PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_From_int((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH));
+    PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_From_int((int)wxGRID_LABEL_EDGE_ZONE));
+    PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_From_int((int)wxGRID_MIN_ROW_HEIGHT));
+    PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_From_int((int)wxGRID_MIN_COL_WIDTH));
+    PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_From_int((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH));
+    PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_From_int((int)wxGridCellAttr::Any));
+    PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_From_int((int)wxGridCellAttr::Default));
+    PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_From_int((int)wxGridCellAttr::Cell));
+    PyDict_SetItemString(d,"GridCellAttr_Row", SWIG_From_int((int)wxGridCellAttr::Row));
+    PyDict_SetItemString(d,"GridCellAttr_Col", SWIG_From_int((int)wxGridCellAttr::Col));
+    PyDict_SetItemString(d,"GridCellAttr_Merged", SWIG_From_int((int)wxGridCellAttr::Merged));
+    PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_GET_VALUES", SWIG_From_int((int)wxGRIDTABLE_REQUEST_VIEW_GET_VALUES));
+    PyDict_SetItemString(d,"GRIDTABLE_REQUEST_VIEW_SEND_VALUES", SWIG_From_int((int)wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES));
+    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_INSERTED", SWIG_From_int((int)wxGRIDTABLE_NOTIFY_ROWS_INSERTED));
+    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_APPENDED", SWIG_From_int((int)wxGRIDTABLE_NOTIFY_ROWS_APPENDED));
+    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_ROWS_DELETED", SWIG_From_int((int)wxGRIDTABLE_NOTIFY_ROWS_DELETED));
+    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_INSERTED", SWIG_From_int((int)wxGRIDTABLE_NOTIFY_COLS_INSERTED));
+    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_APPENDED", SWIG_From_int((int)wxGRIDTABLE_NOTIFY_COLS_APPENDED));
+    PyDict_SetItemString(d,"GRIDTABLE_NOTIFY_COLS_DELETED", SWIG_From_int((int)wxGRIDTABLE_NOTIFY_COLS_DELETED));
+    PyDict_SetItemString(d,"Grid_wxGridSelectCells", SWIG_From_int((int)wxGrid::wxGridSelectCells));
+    PyDict_SetItemString(d,"Grid_wxGridSelectRows", SWIG_From_int((int)wxGrid::wxGridSelectRows));
+    PyDict_SetItemString(d,"Grid_wxGridSelectColumns", SWIG_From_int((int)wxGrid::wxGridSelectColumns));
     PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_CLICK));
     PyDict_SetItemString(d, "wxEVT_GRID_CELL_RIGHT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_RIGHT_CLICK));
     PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_DCLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_DCLICK));

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index c9fd6234dfa25f9161cd174023e6d0bcef4981f7..6fd1fcac21eb2ff35360b8e2b2424f81c828457e 100644 (file)
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxHtmlDCRenderer swig_types[0] 
@@ -221,11 +223,11 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #define  SWIGTYPE_p_wxHtmlParser swig_types[12] 
 #define  SWIGTYPE_p_wxPanel swig_types[13] 
 #define  SWIGTYPE_p_wxFont swig_types[14] 
-#define  SWIGTYPE_p_wxHtmlColourCell swig_types[15] 
-#define  SWIGTYPE_p_wxPyHtmlWindow swig_types[16] 
-#define  SWIGTYPE_p_wxScrolledWindow swig_types[17] 
-#define  SWIGTYPE_p_wxWindow swig_types[18] 
-#define  SWIGTYPE_p_wxTopLevelWindow swig_types[19] 
+#define  SWIGTYPE_p_wxPyHtmlWindow swig_types[15] 
+#define  SWIGTYPE_p_wxScrolledWindow swig_types[16] 
+#define  SWIGTYPE_p_wxWindow swig_types[17] 
+#define  SWIGTYPE_p_wxTopLevelWindow swig_types[18] 
+#define  SWIGTYPE_p_wxHtmlColourCell swig_types[19] 
 #define  SWIGTYPE_p_wxHtmlFontCell swig_types[20] 
 #define  SWIGTYPE_p_wxHtmlEasyPrinting swig_types[21] 
 #define  SWIGTYPE_p_wxHtmlSelection swig_types[22] 
@@ -256,8 +258,8 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #define  SWIGTYPE_p_wxHtmlCell swig_types[47] 
 #define  SWIGTYPE_p_wxHtmlContainerCell swig_types[48] 
 #define  SWIGTYPE_p_wxHtmlTag swig_types[49] 
-#define  SWIGTYPE_p_wxHtmlLinkInfo swig_types[50] 
-#define  SWIGTYPE_p_int swig_types[51] 
+#define  SWIGTYPE_p_int swig_types[50] 
+#define  SWIGTYPE_p_wxHtmlLinkInfo swig_types[51] 
 #define  SWIGTYPE_p_wxHtmlBookRecord swig_types[52] 
 static swig_type_info *swig_types[54];
 
@@ -271,47 +273,64 @@ static swig_type_info *swig_types[54];
 
 #define SWIG_name    "_html"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -332,68 +351,97 @@ static swig_type_info *swig_types[54];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+SWIG_As_int(PyObject* obj)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
 }
 
 void wxHtmlWinParser_SetFonts(wxHtmlWinParser *self,wxString normal_face,wxString fixed_face,PyObject *sizes){
@@ -504,21 +552,20 @@ private:
     }
 
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -531,97 +578,154 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
-{
-  return PyObject_IsTrue(obj) ? true : false;
-}
-
 
 SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return 1;
+  }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
     return 1;
   }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_CheckUnsignedLongInRange(unsigned long value, const char* type,
-                             unsigned long max_value) 
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  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);
-    }
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
-  return value;
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 
-SWIGSTATICINLINE(unsigned long)
-SWIG_AsUnsignedLong(PyObject * obj) 
+SWIGSTATICINLINE(int)
+  SWIG_CheckUnsignedLongInRange(unsigned long value,
+                               unsigned long max_value,
+                               const char *errmsg) 
 {
-  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");
+  if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' minimum %ld",
+                  value, errmsg, max_value);
     }
-    return i;
+    return 0;
   }
+  return 1;
+ }
+
+
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_unsigned_SS_long(PyObject* obj, unsigned long* val)
+{
+    long v = 0;
+    if (SWIG_AsVal_long(obj, &v) && v < 0) {
+        PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+        return 0;
+    }
+    else if (val)
+        *val = (unsigned long)v;
+    return 1;
 }
 
 
 #if UINT_MAX != ULONG_MAX
-SWIGSTATICINLINE(unsigned int)
-SWIG_AsUnsignedInt(PyObject *obj)
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
 { 
-  return swig_numeric_cast(unsigned int,
-    SWIG_CheckUnsignedLongInRange(SWIG_AsUnsignedLong(obj),
-                                 "unsigned int", UINT_MAX));
+  const char* errmsg = val ? "unsigned int" : 0;
+  unsigned long v;
+  if (SWIG_AsVal_unsigned_SS_long(obj, &v)) {
+    if (SWIG_CheckUnsignedLongInRange(v, INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, unsigned int);
+      return 1;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an unsigned int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsUnsignedInt SWIG_AsUnsignedLong
+SWIGSTATICINLINE(unsigned int)
+  SWIG_AsVal_unsigned_SS_int(PyObject *obj, unsigned int *val)
+{
+  return SWIG_AsVal_unsigned_SS_long(obj,(unsigned long *)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckUnsignedInt(PyObject* obj)
+SWIGSTATICINLINE(unsigned int)
+SWIG_As_unsigned_SS_int(PyObject* obj)
 {
-  SWIG_AsUnsignedInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  unsigned int v;
+  if (!SWIG_AsVal_unsigned_SS_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(unsigned int));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_unsigned_SS_int(PyObject* obj)
+{
+  return SWIG_AsVal_unsigned_SS_int(obj, (unsigned int*)0);
 }
 
 
 SWIGSTATICINLINE(PyObject* )
-SWIG_FromUnsignedLong(unsigned long value)
+  SWIG_From_unsigned_SS_long(unsigned long value)
 {
   return (value > LONG_MAX) ?
     PyLong_FromUnsignedLong(value) 
-    : PyInt_FromLong(swig_numeric_cast(long,value)); 
+    : PyInt_FromLong(swig_numeric_cast(value,long)); 
 }
 
 
 #if UINT_MAX < LONG_MAX
-#define SWIG_FromUnsignedInt    SWIG_FromLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_long
+/*@@*/
 #else
-#define SWIG_FromUnsignedInt    SWIG_FromUnsignedLong
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_int SWIG_From_unsigned_SS_long
+/*@@*/
 #endif
 
  // here's the C++ version
@@ -784,64 +888,89 @@ void wxHtmlPrintout_SetFonts(wxHtmlPrintout *self,wxString normal_face,wxString
         }
 
 #include <float.h>
-
-SWIGSTATIC(float)
-SWIG_FloatCast(double value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckDoubleInRange(double value, double min_value, 
+                         double max_value, const char* errmsg)
 {
-  float f = 0;
-  if (!PyErr_Occurred()) {
-    if (value < FLT_MIN) {
-      PyObject *err = 
-        PyString_FromFormat("value %g is less than float minimum %g", 
-                           value, FLT_MIN);
-      PyErr_SetObject(PyExc_OverflowError, err);
-      Py_DECREF(err);
-    } else if (value > FLT_MAX) {
-      PyObject *err = 
-        PyString_FromFormat("value %g is greater than float maximum %g", 
-                           value, FLT_MAX);
-      PyErr_SetObject(PyExc_OverflowError, err);
-      Py_DECREF(err);
-    } else {
-      f = swig_numeric_cast(float, value);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %g is less than %s minimum %g", 
+                  value, errmsg, min_value);
     }
+    return 0;
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %g is greater than %s maximum %g", 
+                  value, errmsg, max_value);
+    }
+    return 0;
   }
-  return f;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(double)
-SWIG_AsDouble(PyObject *obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_double(PyObject *obj, double* val)
 {
-    if (PyNumber_Check(obj))
-        return PyFloat_AsDouble(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyFloat_AsDouble(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
+}
+
+
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_float(PyObject *obj, float *val)
+{
+  const char* errmsg = val ? "float" : 0;
+  double v;
+  if (SWIG_AsVal_double(obj, &v)) {
+    if (SWIG_CheckDoubleInRange(v, -FLT_MAX, FLT_MAX, errmsg)) {
+      if (val) *val = v;
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a float is expected");
+  }
+  return 0;
 }
 
 
 SWIGSTATICINLINE(float)
-SWIG_AsFloat(PyObject *obj)
+SWIG_As_float(PyObject* obj)
 {
-  return SWIG_FloatCast(SWIG_AsDouble(obj));
+  float v;
+  if (!SWIG_AsVal_float(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(float));
+  }
+  return v;
 }
 
-
+  
 SWIGSTATICINLINE(int)
-SWIG_CheckFloat(PyObject* obj)
+SWIG_Check_float(PyObject* obj)
 {
-  SWIG_AsFloat(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
-  }
+  return SWIG_AsVal_float(obj, (float*)0);
 }
 
 void wxHtmlEasyPrinting_SetFonts(wxHtmlEasyPrinting *self,wxString normal_face,wxString fixed_face,PyObject *sizes){
@@ -859,7 +988,7 @@ wxHtmlBookRecord *wxHtmlContentsItem_GetBook(wxHtmlContentsItem *self){ return s
 #ifdef __cplusplus
 extern "C" {
 #endif
-static int _wrap_HtmlWindowNameStr_set(PyObject *_val) {
+static int _wrap_HtmlWindowNameStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable HtmlWindowNameStr is read-only.");
     return 1;
 }
@@ -879,7 +1008,7 @@ static PyObject *_wrap_HtmlWindowNameStr_get() {
 }
 
 
-static int _wrap_HtmlPrintoutTitleStr_set(PyObject *_val) {
+static int _wrap_HtmlPrintoutTitleStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintoutTitleStr is read-only.");
     return 1;
 }
@@ -899,7 +1028,7 @@ static PyObject *_wrap_HtmlPrintoutTitleStr_get() {
 }
 
 
-static int _wrap_HtmlPrintingTitleStr_set(PyObject *_val) {
+static int _wrap_HtmlPrintingTitleStr_set(PyObject *) {
     PyErr_SetString(PyExc_TypeError,"Variable HtmlPrintingTitleStr is read-only.");
     return 1;
 }
@@ -919,7 +1048,7 @@ static PyObject *_wrap_HtmlPrintingTitleStr_get() {
 }
 
 
-static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlLinkInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString const &arg2_defvalue = wxPyEmptyString ;
@@ -976,7 +1105,7 @@ static PyObject *_wrap_new_HtmlLinkInfo(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetHref(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetHref(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxString result;
@@ -1008,7 +1137,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetHref(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetTarget(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetTarget(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxString result;
@@ -1040,7 +1169,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetTarget(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxMouseEvent *result;
@@ -1068,7 +1197,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_GetHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_GetHtmlCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxHtmlCell *result;
@@ -1094,7 +1223,7 @@ static PyObject *_wrap_HtmlLinkInfo_GetHtmlCell(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_SetEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_SetEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxMouseEvent *arg2 = (wxMouseEvent *) 0 ;
@@ -1123,7 +1252,7 @@ static PyObject *_wrap_HtmlLinkInfo_SetEvent(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlLinkInfo_SetHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlLinkInfo_SetHtmlCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlLinkInfo *arg1 = (wxHtmlLinkInfo *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -1152,14 +1281,14 @@ static PyObject *_wrap_HtmlLinkInfo_SetHtmlCell(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * HtmlLinkInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlLinkInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlLinkInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlTag_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString result;
@@ -1191,7 +1320,7 @@ static PyObject *_wrap_HtmlTag_GetName(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_HasParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString *arg2 = 0 ;
@@ -1235,7 +1364,7 @@ static PyObject *_wrap_HtmlTag_HasParam(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetParam(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString *arg2 = 0 ;
@@ -1258,7 +1387,7 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1289,7 +1418,7 @@ static PyObject *_wrap_HtmlTag_GetParam(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlTag_GetAllParams(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetAllParams(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     wxString result;
@@ -1321,7 +1450,7 @@ static PyObject *_wrap_HtmlTag_GetAllParams(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_HasEnding(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     bool result;
@@ -1349,7 +1478,7 @@ static PyObject *_wrap_HtmlTag_HasEnding(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     int result;
@@ -1368,14 +1497,14 @@ static PyObject *_wrap_HtmlTag_GetBeginPos(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     int result;
@@ -1394,14 +1523,14 @@ static PyObject *_wrap_HtmlTag_GetEndPos1(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlTag *arg1 = (wxHtmlTag *) 0 ;
     int result;
@@ -1420,21 +1549,21 @@ static PyObject *_wrap_HtmlTag_GetEndPos2(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * HtmlTag_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlTag_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlTag, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlParser_SetFS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_SetFS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxFileSystem *arg2 = (wxFileSystem *) 0 ;
@@ -1463,7 +1592,7 @@ static PyObject *_wrap_HtmlParser_SetFS(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlParser_GetFS(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_GetFS(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxFileSystem *result;
@@ -1491,7 +1620,7 @@ static PyObject *_wrap_HtmlParser_GetFS(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_Parse(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *arg2 = 0 ;
@@ -1535,7 +1664,7 @@ static PyObject *_wrap_HtmlParser_Parse(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_InitParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *arg2 = 0 ;
@@ -1576,7 +1705,7 @@ static PyObject *_wrap_HtmlParser_InitParser(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlParser_DoneParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_DoneParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1601,7 +1730,7 @@ static PyObject *_wrap_HtmlParser_DoneParser(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlParser_DoParsing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_DoParsing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     int arg2 ;
@@ -1616,9 +1745,9 @@ static PyObject *_wrap_HtmlParser_DoParsing(PyObject *self, PyObject *args, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlParser_DoParsing",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1634,7 +1763,7 @@ static PyObject *_wrap_HtmlParser_DoParsing(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlParser_StopParsing(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_StopParsing(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1659,7 +1788,7 @@ static PyObject *_wrap_HtmlParser_StopParsing(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlParser_AddTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_AddTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxHtmlTagHandler *arg2 = (wxHtmlTagHandler *) 0 ;
@@ -1688,7 +1817,7 @@ static PyObject *_wrap_HtmlParser_AddTagHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlParser_GetSource(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_GetSource(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxString *result;
@@ -1720,7 +1849,7 @@ static PyObject *_wrap_HtmlParser_GetSource(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     wxHtmlTagHandler *arg2 = (wxHtmlTagHandler *) 0 ;
@@ -1757,7 +1886,7 @@ static PyObject *_wrap_HtmlParser_PushTagHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlParser_PopTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlParser_PopTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1782,14 +1911,14 @@ static PyObject *_wrap_HtmlParser_PopTagHandler(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * HtmlParser_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlParser_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlParser, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWinParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWinParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) NULL ;
     wxHtmlWinParser *result;
@@ -1817,7 +1946,7 @@ static PyObject *_wrap_new_HtmlWinParser(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -1846,7 +1975,7 @@ static PyObject *_wrap_HtmlWinParser_SetDC(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxDC *result;
@@ -1874,7 +2003,7 @@ static PyObject *_wrap_HtmlWinParser_GetDC(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -1893,14 +2022,14 @@ static PyObject *_wrap_HtmlWinParser_GetCharHeight(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -1919,14 +2048,14 @@ static PyObject *_wrap_HtmlWinParser_GetCharWidth(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxPyHtmlWindow *result;
@@ -1954,7 +2083,7 @@ static PyObject *_wrap_HtmlWinParser_GetWindow(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxString arg2 ;
@@ -2000,7 +2129,7 @@ static PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_NormalizeFontSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 = (int) -1 ;
@@ -2014,7 +2143,7 @@ static PyObject *_wrap_HtmlWinParser_NormalizeFontSizes(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2031,7 +2160,7 @@ static PyObject *_wrap_HtmlWinParser_NormalizeFontSizes(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetContainer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *result;
@@ -2057,7 +2186,7 @@ static PyObject *_wrap_HtmlWinParser_GetContainer(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWinParser_OpenContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_OpenContainer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *result;
@@ -2083,7 +2212,7 @@ static PyObject *_wrap_HtmlWinParser_OpenContainer(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetContainer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *arg2 = (wxHtmlContainerCell *) 0 ;
@@ -2113,7 +2242,7 @@ static PyObject *_wrap_HtmlWinParser_SetContainer(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWinParser_CloseContainer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_CloseContainer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxHtmlContainerCell *result;
@@ -2139,7 +2268,7 @@ static PyObject *_wrap_HtmlWinParser_CloseContainer(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2158,14 +2287,14 @@ static PyObject *_wrap_HtmlWinParser_GetFontSize(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2178,7 +2307,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2194,7 +2323,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontSize(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2213,14 +2342,14 @@ static PyObject *_wrap_HtmlWinParser_GetFontBold(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2233,7 +2362,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontBold",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2249,7 +2378,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontBold(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2268,14 +2397,14 @@ static PyObject *_wrap_HtmlWinParser_GetFontItalic(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2288,7 +2417,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontItalic",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2304,7 +2433,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontItalic(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2323,14 +2452,14 @@ static PyObject *_wrap_HtmlWinParser_GetFontUnderlined(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2343,7 +2472,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontUnderlined",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2359,7 +2488,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontUnderlined(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2378,14 +2507,14 @@ static PyObject *_wrap_HtmlWinParser_GetFontFixed(PyObject *self, PyObject *args
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2398,7 +2527,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *self, PyObject *args
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetFontFixed",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2414,7 +2543,7 @@ static PyObject *_wrap_HtmlWinParser_SetFontFixed(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int result;
@@ -2433,14 +2562,14 @@ static PyObject *_wrap_HtmlWinParser_GetAlign(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     int arg2 ;
@@ -2453,7 +2582,7 @@ static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWinParser_SetAlign",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlWinParser,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2469,7 +2598,7 @@ static PyObject *_wrap_HtmlWinParser_SetAlign(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetLinkColor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetLinkColor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour result;
@@ -2499,7 +2628,7 @@ static PyObject *_wrap_HtmlWinParser_GetLinkColor(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetLinkColor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetLinkColor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2531,7 +2660,7 @@ static PyObject *_wrap_HtmlWinParser_SetLinkColor(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetActualColor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetActualColor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour result;
@@ -2561,7 +2690,7 @@ static PyObject *_wrap_HtmlWinParser_GetActualColor(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetActualColor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetActualColor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxColour *arg2 = 0 ;
@@ -2593,7 +2722,7 @@ static PyObject *_wrap_HtmlWinParser_SetActualColor(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxString *arg2 = 0 ;
@@ -2634,7 +2763,7 @@ static PyObject *_wrap_HtmlWinParser_SetLink(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWinParser_CreateCurrentFont(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_CreateCurrentFont(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     wxFont *result;
@@ -2660,7 +2789,7 @@ static PyObject *_wrap_HtmlWinParser_CreateCurrentFont(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWinParser_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_GetLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
     SwigValueWrapper< wxHtmlLinkInfo > result;
@@ -2690,14 +2819,14 @@ static PyObject *_wrap_HtmlWinParser_GetLink(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * HtmlWinParser_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlWinParser_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlWinParser, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *result;
     char *kwnames[] = {
@@ -2719,7 +2848,7 @@ static PyObject *_wrap_new_HtmlTagHandler(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlTagHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2750,7 +2879,7 @@ static PyObject *_wrap_HtmlTagHandler__setCallbackInfo(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlTagHandler_SetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler_SetParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     wxHtmlParser *arg2 = (wxHtmlParser *) 0 ;
@@ -2779,7 +2908,7 @@ static PyObject *_wrap_HtmlTagHandler_SetParser(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlTagHandler_GetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler_GetParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     wxHtmlParser *result;
@@ -2805,7 +2934,7 @@ static PyObject *_wrap_HtmlTagHandler_GetParser(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlTagHandler_ParseInner(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlTagHandler_ParseInner(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlTagHandler *arg1 = (wxPyHtmlTagHandler *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -2839,14 +2968,14 @@ static PyObject *_wrap_HtmlTagHandler_ParseInner(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * HtmlTagHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlTagHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlTagHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWinTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWinTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *result;
     char *kwnames[] = {
@@ -2868,7 +2997,7 @@ static PyObject *_wrap_new_HtmlWinTagHandler(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -2899,7 +3028,7 @@ static PyObject *_wrap_HtmlWinTagHandler__setCallbackInfo(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler_SetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler_SetParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     wxHtmlParser *arg2 = (wxHtmlParser *) 0 ;
@@ -2928,7 +3057,7 @@ static PyObject *_wrap_HtmlWinTagHandler_SetParser(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler_GetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler_GetParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     wxHtmlWinParser *result;
@@ -2954,7 +3083,7 @@ static PyObject *_wrap_HtmlWinTagHandler_GetParser(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWinTagHandler_ParseInner(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinTagHandler_ParseInner(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWinTagHandler *arg1 = (wxPyHtmlWinTagHandler *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -2988,14 +3117,14 @@ static PyObject *_wrap_HtmlWinTagHandler_ParseInner(PyObject *self, PyObject *ar
 }
 
 
-static PyObject * HtmlWinTagHandler_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlWinTagHandler_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlWinTagHandler, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlWinParser_AddTagHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWinParser_AddTagHandler(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     PyObject *arg1 = (PyObject *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3019,7 +3148,7 @@ static PyObject *_wrap_HtmlWinParser_AddTagHandler(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_new_HtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *result;
     char *kwnames[] = {
@@ -3041,7 +3170,7 @@ static PyObject *_wrap_new_HtmlSelection(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_delete_HtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3066,7 +3195,7 @@ static PyObject *_wrap_delete_HtmlSelection(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlSelection_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_Set(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3113,7 +3242,7 @@ static PyObject *_wrap_HtmlSelection_Set(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlSelection_SetCells(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_SetCells(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -3146,7 +3275,7 @@ static PyObject *_wrap_HtmlSelection_SetCells(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxHtmlCell *result;
@@ -3172,7 +3301,7 @@ static PyObject *_wrap_HtmlSelection_GetFromCell(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxHtmlCell *result;
@@ -3198,7 +3327,7 @@ static PyObject *_wrap_HtmlSelection_GetToCell(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetFromPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetFromPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3227,7 +3356,7 @@ static PyObject *_wrap_HtmlSelection_GetFromPos(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetToPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetToPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3256,7 +3385,7 @@ static PyObject *_wrap_HtmlSelection_GetToPos(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetFromPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3285,7 +3414,7 @@ static PyObject *_wrap_HtmlSelection_GetFromPrivPos(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlSelection_GetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_GetToPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *result;
@@ -3314,7 +3443,7 @@ static PyObject *_wrap_HtmlSelection_GetToPrivPos(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlSelection_SetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_SetFromPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3346,7 +3475,7 @@ static PyObject *_wrap_HtmlSelection_SetFromPrivPos(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlSelection_SetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_SetToPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -3378,7 +3507,7 @@ static PyObject *_wrap_HtmlSelection_SetToPrivPos(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlSelection_ClearPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_ClearPrivPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3403,7 +3532,7 @@ static PyObject *_wrap_HtmlSelection_ClearPrivPos(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSelection *arg1 = (wxHtmlSelection *) 0 ;
     bool result;
@@ -3431,14 +3560,14 @@ static PyObject *_wrap_HtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject * HtmlSelection_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlSelection_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlSelection, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlRenderingState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *result;
     char *kwnames[] = {
@@ -3460,7 +3589,7 @@ static PyObject *_wrap_new_HtmlRenderingState(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_delete_HtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlRenderingState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3485,7 +3614,7 @@ static PyObject *_wrap_delete_HtmlRenderingState(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     int arg2 ;
@@ -3498,7 +3627,7 @@ static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *self, PyOb
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlRenderingState_SetSelectionState",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlRenderingState,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (wxHtmlSelectionState) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -3514,7 +3643,7 @@ static PyObject *_wrap_HtmlRenderingState_SetSelectionState(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     int result;
@@ -3533,14 +3662,14 @@ static PyObject *_wrap_HtmlRenderingState_GetSelectionState(PyObject *self, PyOb
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_SetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_SetFgColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3572,7 +3701,7 @@ static PyObject *_wrap_HtmlRenderingState_SetFgColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_GetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_GetFgColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *result;
@@ -3601,7 +3730,7 @@ static PyObject *_wrap_HtmlRenderingState_GetFgColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_SetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_SetBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3633,7 +3762,7 @@ static PyObject *_wrap_HtmlRenderingState_SetBgColour(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlRenderingState_GetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingState_GetBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingState *arg1 = (wxHtmlRenderingState *) 0 ;
     wxColour *result;
@@ -3662,14 +3791,14 @@ static PyObject *_wrap_HtmlRenderingState_GetBgColour(PyObject *self, PyObject *
 }
 
 
-static PyObject * HtmlRenderingState_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlRenderingState_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlRenderingState, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingStyle *arg1 = (wxHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3706,7 +3835,7 @@ static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextColour(PyObject *self,
 }
 
 
-static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingStyle *arg1 = (wxHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3743,14 +3872,14 @@ static PyObject *_wrap_HtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self
 }
 
 
-static PyObject * HtmlRenderingStyle_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlRenderingStyle_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlRenderingStyle, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDefaultHtmlRenderingStyle *arg1 = (wxDefaultHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3787,7 +3916,7 @@ static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject
 }
 
 
-static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxDefaultHtmlRenderingStyle *arg1 = (wxDefaultHtmlRenderingStyle *) 0 ;
     wxColour *arg2 = 0 ;
@@ -3824,14 +3953,14 @@ static PyObject *_wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObjec
 }
 
 
-static PyObject * DefaultHtmlRenderingStyle_swigregister(PyObject *self, PyObject *args) {
+static PyObject * DefaultHtmlRenderingStyle_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxDefaultHtmlRenderingStyle, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlRenderingInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *result;
     char *kwnames[] = {
@@ -3853,7 +3982,7 @@ static PyObject *_wrap_new_HtmlRenderingInfo(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_delete_HtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlRenderingInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     PyObject * obj0 = 0 ;
@@ -3878,7 +4007,7 @@ static PyObject *_wrap_delete_HtmlRenderingInfo(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_SetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlSelection *arg2 = (wxHtmlSelection *) 0 ;
@@ -3907,7 +4036,7 @@ static PyObject *_wrap_HtmlRenderingInfo_SetSelection(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlSelection *result;
@@ -3933,7 +4062,7 @@ static PyObject *_wrap_HtmlRenderingInfo_GetSelection(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_SetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlRenderingStyle *arg2 = (wxHtmlRenderingStyle *) 0 ;
@@ -3962,7 +4091,7 @@ static PyObject *_wrap_HtmlRenderingInfo_SetStyle(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_GetStyle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlRenderingStyle *result;
@@ -3991,7 +4120,7 @@ static PyObject *_wrap_HtmlRenderingInfo_GetStyle(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlRenderingInfo_GetState(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlRenderingInfo_GetState(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlRenderingInfo *arg1 = (wxHtmlRenderingInfo *) 0 ;
     wxHtmlRenderingState *result;
@@ -4020,14 +4149,14 @@ static PyObject *_wrap_HtmlRenderingInfo_GetState(PyObject *self, PyObject *args
 }
 
 
-static PyObject * HtmlRenderingInfo_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlRenderingInfo_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlRenderingInfo, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *result;
     char *kwnames[] = {
@@ -4049,7 +4178,7 @@ static PyObject *_wrap_new_HtmlCell(PyObject *self, PyObject *args, PyObject *kw
 }
 
 
-static PyObject *_wrap_HtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetPosX(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4068,14 +4197,14 @@ static PyObject *_wrap_HtmlCell_GetPosX(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetPosY(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4094,14 +4223,14 @@ static PyObject *_wrap_HtmlCell_GetPosY(PyObject *self, PyObject *args, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4120,14 +4249,14 @@ static PyObject *_wrap_HtmlCell_GetWidth(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4146,14 +4275,14 @@ static PyObject *_wrap_HtmlCell_GetHeight(PyObject *self, PyObject *args, PyObje
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_GetDescent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetDescent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4172,14 +4301,14 @@ static PyObject *_wrap_HtmlCell_GetDescent(PyObject *self, PyObject *args, PyObj
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_GetMaxTotalWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetMaxTotalWidth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int result;
@@ -4198,14 +4327,14 @@ static PyObject *_wrap_HtmlCell_GetMaxTotalWidth(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxString *result;
@@ -4240,7 +4369,7 @@ static PyObject *_wrap_HtmlCell_GetId(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetId(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxString *arg2 = 0 ;
@@ -4281,7 +4410,7 @@ static PyObject *_wrap_HtmlCell_SetId(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 = (int) 0 ;
@@ -4298,11 +4427,11 @@ static PyObject *_wrap_HtmlCell_GetLink(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4319,7 +4448,7 @@ static PyObject *_wrap_HtmlCell_GetLink(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4345,7 +4474,7 @@ static PyObject *_wrap_HtmlCell_GetNext(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlContainerCell *result;
@@ -4371,7 +4500,7 @@ static PyObject *_wrap_HtmlCell_GetParent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4397,7 +4526,7 @@ static PyObject *_wrap_HtmlCell_GetFirstChild(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlCell_GetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetCursor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxCursor result;
@@ -4427,7 +4556,7 @@ static PyObject *_wrap_HtmlCell_GetCursor(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool result;
@@ -4455,7 +4584,7 @@ static PyObject *_wrap_HtmlCell_IsFormattingCell(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlCell_SetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetLink(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlLinkInfo *arg2 = 0 ;
@@ -4489,7 +4618,7 @@ static PyObject *_wrap_HtmlCell_SetLink(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -4518,7 +4647,7 @@ static PyObject *_wrap_HtmlCell_SetNext(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_SetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetParent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlContainerCell *arg2 = (wxHtmlContainerCell *) 0 ;
@@ -4547,7 +4676,7 @@ static PyObject *_wrap_HtmlCell_SetParent(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_SetPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4562,9 +4691,9 @@ static PyObject *_wrap_HtmlCell_SetPos(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlCell_SetPos",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4580,7 +4709,7 @@ static PyObject *_wrap_HtmlCell_SetPos(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_Layout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_Layout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4593,7 +4722,7 @@ static PyObject *_wrap_HtmlCell_Layout(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_Layout",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4609,7 +4738,7 @@ static PyObject *_wrap_HtmlCell_Layout(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlCell_Draw(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_Draw(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxDC *arg2 = 0 ;
@@ -4639,13 +4768,13 @@ static PyObject *_wrap_HtmlCell_Draw(PyObject *self, PyObject *args, PyObject *k
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg6 = (int) SWIG_AsInt(obj5); 
+    arg6 = (int)SWIG_As_int(obj5); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj6,(void **)(&arg7),SWIGTYPE_p_wxHtmlRenderingInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -4668,7 +4797,7 @@ static PyObject *_wrap_HtmlCell_Draw(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxDC *arg2 = 0 ;
@@ -4694,9 +4823,9 @@ static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *self, PyObject *args, Py
         PyErr_SetString(PyExc_TypeError,"null reference");
         SWIG_fail;
     }
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxHtmlRenderingInfo,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -4719,7 +4848,7 @@ static PyObject *_wrap_HtmlCell_DrawInvisible(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlCell_Find(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_Find(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4735,7 +4864,7 @@ static PyObject *_wrap_HtmlCell_Find(PyObject *self, PyObject *args, PyObject *k
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlCell_Find",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj2,&arg3,0,SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
@@ -4752,12 +4881,13 @@ static PyObject *_wrap_HtmlCell_Find(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int *arg2 = (int *) 0 ;
     bool result;
     int temp2 ;
+    int res2 = 0 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -4768,9 +4898,12 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args,
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     {
-        temp2 = PyInt_AsLong(obj1);
-        if (PyErr_Occurred()) SWIG_fail;
-        arg2 = &temp2;
+        if (!(SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_int,0) != -1)) {
+            temp2 = SWIG_As_int(obj1);
+            if (PyErr_Occurred()) SWIG_fail;
+            arg2 = &temp2;
+            res2 = SWIG_NEWOBJ;
+        }
     }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4782,17 +4915,15 @@ static PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *self, PyObject *args,
     {
         resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
     }
-    {
-        PyObject *o = PyInt_FromLong((long) (*arg2));
-        resultobj = t_output_helper(resultobj,o);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool arg2 ;
@@ -4805,7 +4936,7 @@ static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_SetCanLiveOnPagebreak",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (bool) SWIG_AsBool(obj1); 
+    arg2 = (bool)SWIG_As_bool(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -4821,7 +4952,7 @@ static PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool result;
@@ -4849,7 +4980,7 @@ static PyObject *_wrap_HtmlCell_IsLinebreakAllowed(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     bool result;
@@ -4877,7 +5008,7 @@ static PyObject *_wrap_HtmlCell_IsTerminalCell(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     int arg2 ;
@@ -4895,12 +5026,12 @@ static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlCell_FindCellByPos",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (unsigned int) SWIG_AsUnsignedInt(obj3); 
+        arg4 = (unsigned int)SWIG_As_unsigned_SS_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -4917,7 +5048,7 @@ static PyObject *_wrap_HtmlCell_FindCellByPos(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxPoint result;
@@ -4947,7 +5078,7 @@ static PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4973,7 +5104,7 @@ static PyObject *_wrap_HtmlCell_GetFirstTerminal(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *result;
@@ -4999,7 +5130,7 @@ static PyObject *_wrap_HtmlCell_GetLastTerminal(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlCell_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_GetDepth(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     unsigned int result;
@@ -5018,14 +5149,14 @@ static PyObject *_wrap_HtmlCell_GetDepth(PyObject *self, PyObject *args, PyObjec
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromUnsignedInt((unsigned int)result);
+    resultobj = SWIG_From_unsigned_SS_int((unsigned int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_IsBefore(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -5057,7 +5188,7 @@ static PyObject *_wrap_HtmlCell_IsBefore(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlCell_ConvertToText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlCell_ConvertToText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
     wxHtmlSelection *arg2 = (wxHtmlSelection *) 0 ;
@@ -5093,14 +5224,14 @@ static PyObject *_wrap_HtmlCell_ConvertToText(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * HtmlCell_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlCell_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWordCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxDC *arg2 = 0 ;
@@ -5147,14 +5278,14 @@ static PyObject *_wrap_new_HtmlWordCell(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * HtmlWordCell_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlWordCell_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlWordCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlContainerCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlContainerCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlContainerCell *result;
@@ -5180,7 +5311,7 @@ static PyObject *_wrap_new_HtmlContainerCell(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_InsertCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_InsertCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -5209,7 +5340,7 @@ static PyObject *_wrap_HtmlContainerCell_InsertCell(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5222,7 +5353,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_SetAlignHor",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5238,7 +5369,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignHor(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int result;
@@ -5257,14 +5388,14 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignHor(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5277,7 +5408,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *self, PyObject *a
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_SetAlignVer",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5293,7 +5424,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlignVer(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int result;
@@ -5312,14 +5443,14 @@ static PyObject *_wrap_HtmlContainerCell_GetAlignVer(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5336,12 +5467,12 @@ static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:HtmlContainerCell_SetIndent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5358,7 +5489,7 @@ static PyObject *_wrap_HtmlContainerCell_SetIndent(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5372,7 +5503,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_GetIndent",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5381,14 +5512,14 @@ static PyObject *_wrap_HtmlContainerCell_GetIndent(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5402,7 +5533,7 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlContainerCell_GetIndentUnits",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5411,14 +5542,14 @@ static PyObject *_wrap_HtmlContainerCell_GetIndentUnits(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetAlign(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetAlign(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -5452,7 +5583,7 @@ static PyObject *_wrap_HtmlContainerCell_SetAlign(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5467,9 +5598,9 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlContainerCell_SetWidthFloat",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -5485,7 +5616,7 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloat(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetWidthFloatFromTag(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetWidthFloatFromTag(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlTag *arg2 = 0 ;
@@ -5519,7 +5650,7 @@ static PyObject *_wrap_HtmlContainerCell_SetWidthFloatFromTag(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     int arg2 ;
@@ -5534,10 +5665,10 @@ static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:HtmlContainerCell_SetMinHeight",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlContainerCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5554,7 +5685,7 @@ static PyObject *_wrap_HtmlContainerCell_SetMinHeight(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxColour *arg2 = 0 ;
@@ -5586,7 +5717,7 @@ static PyObject *_wrap_HtmlContainerCell_SetBackgroundColour(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetBackgroundColour(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxColour result;
@@ -5616,7 +5747,7 @@ static PyObject *_wrap_HtmlContainerCell_GetBackgroundColour(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxColour *arg2 = 0 ;
@@ -5655,7 +5786,7 @@ static PyObject *_wrap_HtmlContainerCell_SetBorder(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContainerCell *arg1 = (wxHtmlContainerCell *) 0 ;
     wxHtmlCell *result;
@@ -5681,14 +5812,14 @@ static PyObject *_wrap_HtmlContainerCell_GetFirstChild(PyObject *self, PyObject
 }
 
 
-static PyObject * HtmlContainerCell_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlContainerCell_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlContainerCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlColourCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlColourCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxColour arg1 ;
     int arg2 = (int) wxHTML_CLR_FOREGROUND ;
@@ -5705,7 +5836,7 @@ static PyObject *_wrap_new_HtmlColourCell(PyObject *self, PyObject *args, PyObje
     SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
     arg1 = *argp1;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5722,14 +5853,14 @@ static PyObject *_wrap_new_HtmlColourCell(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * HtmlColourCell_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlColourCell_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlColourCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlFontCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlFontCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxFont *arg1 = (wxFont *) 0 ;
     wxHtmlFontCell *result;
@@ -5755,14 +5886,14 @@ static PyObject *_wrap_new_HtmlFontCell(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject * HtmlFontCell_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlFontCell_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlFontCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWidgetCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWidgetCell(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) 0 ;
@@ -5777,7 +5908,7 @@ static PyObject *_wrap_new_HtmlWidgetCell(PyObject *self, PyObject *args, PyObje
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -5794,14 +5925,14 @@ static PyObject *_wrap_new_HtmlWidgetCell(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * HtmlWidgetCell_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlWidgetCell_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlWidgetCell, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlFilter *result;
     char *kwnames[] = {
@@ -5823,7 +5954,7 @@ static PyObject *_wrap_new_HtmlFilter(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlFilter__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlFilter__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlFilter *arg1 = (wxPyHtmlFilter *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -5854,14 +5985,14 @@ static PyObject *_wrap_HtmlFilter__setCallbackInfo(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * HtmlFilter_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlFilter_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlFilter, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -5890,7 +6021,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -5906,7 +6037,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
         }
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
@@ -5939,7 +6070,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
 }
 
 
-static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreHtmlWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *result;
     char *kwnames[] = {
@@ -5962,7 +6093,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -5995,7 +6126,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -6011,7 +6142,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -6045,7 +6176,7 @@ static PyObject *_wrap_HtmlWindow_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWindow__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -6076,7 +6207,7 @@ static PyObject *_wrap_HtmlWindow__setCallbackInfo(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6120,7 +6251,7 @@ static PyObject *_wrap_HtmlWindow_SetPage(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6164,7 +6295,7 @@ static PyObject *_wrap_HtmlWindow_LoadPage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6208,7 +6339,7 @@ static PyObject *_wrap_HtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6252,7 +6383,7 @@ static PyObject *_wrap_HtmlWindow_AppendToPage(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetOpenedPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetOpenedPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -6284,7 +6415,7 @@ static PyObject *_wrap_HtmlWindow_GetOpenedPage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetOpenedAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetOpenedAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -6316,7 +6447,7 @@ static PyObject *_wrap_HtmlWindow_GetOpenedAnchor(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetOpenedPageTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetOpenedPageTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -6348,7 +6479,7 @@ static PyObject *_wrap_HtmlWindow_GetOpenedPageTitle(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxFrame *arg2 = (wxFrame *) 0 ;
@@ -6393,7 +6524,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedFrame(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetRelatedFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetRelatedFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxFrame *result;
@@ -6421,7 +6552,7 @@ static PyObject *_wrap_HtmlWindow_GetRelatedFrame(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     int arg2 ;
@@ -6434,7 +6565,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetRelatedStatusBar",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6450,7 +6581,7 @@ static PyObject *_wrap_HtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString arg2 ;
@@ -6496,7 +6627,7 @@ static PyObject *_wrap_HtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWindow_NormalizeFontSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -6510,7 +6641,7 @@ static PyObject *_wrap_HtmlWindow_NormalizeFontSizes(PyObject *self, PyObject *a
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -6527,7 +6658,7 @@ static PyObject *_wrap_HtmlWindow_NormalizeFontSizes(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6568,7 +6699,7 @@ static PyObject *_wrap_HtmlWindow_SetTitle(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     int arg2 ;
@@ -6581,7 +6712,7 @@ static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SetBorders",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -6597,7 +6728,7 @@ static PyObject *_wrap_HtmlWindow_SetBorders(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -6636,7 +6767,7 @@ static PyObject *_wrap_HtmlWindow_ReadCustomization(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -6675,7 +6806,7 @@ static PyObject *_wrap_HtmlWindow_WriteCustomization(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6703,7 +6834,7 @@ static PyObject *_wrap_HtmlWindow_HistoryBack(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6731,7 +6862,7 @@ static PyObject *_wrap_HtmlWindow_HistoryForward(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6759,7 +6890,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanBack(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     bool result;
@@ -6787,7 +6918,7 @@ static PyObject *_wrap_HtmlWindow_HistoryCanForward(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlWindow_HistoryClear(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HistoryClear(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6812,7 +6943,7 @@ static PyObject *_wrap_HtmlWindow_HistoryClear(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetInternalRepresentation(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetInternalRepresentation(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlContainerCell *result;
@@ -6838,7 +6969,7 @@ static PyObject *_wrap_HtmlWindow_GetInternalRepresentation(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetParser(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetParser(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlWinParser *result;
@@ -6864,7 +6995,7 @@ static PyObject *_wrap_HtmlWindow_GetParser(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6908,7 +7039,7 @@ static PyObject *_wrap_HtmlWindow_ScrollToAnchor(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -6952,7 +7083,7 @@ static PyObject *_wrap_HtmlWindow_HasAnchor(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlFilter *arg1 = (wxPyHtmlFilter *) 0 ;
     PyObject * obj0 = 0 ;
@@ -6977,7 +7108,7 @@ static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -7009,7 +7140,7 @@ static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxPoint *arg2 = 0 ;
@@ -7041,7 +7172,7 @@ static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7066,7 +7197,7 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -7098,7 +7229,7 @@ static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_ToText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString result;
@@ -7130,7 +7261,7 @@ static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlLinkInfo *arg2 = 0 ;
@@ -7164,7 +7295,7 @@ static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxString *arg2 = 0 ;
@@ -7205,7 +7336,7 @@ static PyObject *_wrap_HtmlWindow_base_OnSetTitle(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -7224,9 +7355,9 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7242,7 +7373,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellMouseHover(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
     wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
@@ -7263,9 +7394,9 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *a
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxHtmlCell,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
     if ((SWIG_ConvertPtr(obj4,(void **)(&arg5),SWIGTYPE_p_wxMouseEvent,
     SWIG_POINTER_EXCEPTION | 0)) == -1)
@@ -7288,7 +7419,7 @@ static PyObject *_wrap_HtmlWindow_base_OnCellClicked(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlWindow_GetClassDefaultAttributes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlWindow_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
     wxVisualAttributes result;
@@ -7299,7 +7430,7 @@ static PyObject *_wrap_HtmlWindow_GetClassDefaultAttributes(PyObject *self, PyOb
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:HtmlWindow_GetClassDefaultAttributes",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (wxWindowVariant) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7321,14 +7452,14 @@ static PyObject *_wrap_HtmlWindow_GetClassDefaultAttributes(PyObject *self, PyOb
 }
 
 
-static PyObject * HtmlWindow_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlWindow_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyHtmlWindow, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlDCRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlDCRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *result;
     char *kwnames[] = {
@@ -7351,7 +7482,7 @@ static PyObject *_wrap_new_HtmlDCRenderer(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_delete_HtmlDCRenderer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlDCRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     PyObject * obj0 = 0 ;
@@ -7376,7 +7507,7 @@ static PyObject *_wrap_delete_HtmlDCRenderer(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     wxDC *arg2 = (wxDC *) 0 ;
@@ -7393,7 +7524,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *self, PyObject *args, PyOb
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxDC,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7409,7 +7540,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetDC(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int arg2 ;
@@ -7424,9 +7555,9 @@ static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *self, PyObject *args, Py
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlDCRenderer_SetSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlDCRenderer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -7442,7 +7573,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetSize(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     wxString *arg2 = 0 ;
@@ -7475,7 +7606,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args
         }
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7508,7 +7639,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     wxString arg2 ;
@@ -7554,7 +7685,7 @@ static PyObject *_wrap_HtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_NormalizeFontSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int arg2 = (int) -1 ;
@@ -7568,7 +7699,7 @@ static PyObject *_wrap_HtmlDCRenderer_NormalizeFontSizes(PyObject *self, PyObjec
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlDCRenderer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7585,7 +7716,7 @@ static PyObject *_wrap_HtmlDCRenderer_NormalizeFontSizes(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int arg2 ;
@@ -7611,20 +7742,20 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlDCRenderer,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (int) SWIG_AsInt(obj4); 
+        arg5 = (int)SWIG_As_int(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj6) {
@@ -7632,7 +7763,7 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO
         SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     }
     if (obj7) {
-        arg8 = (int) SWIG_AsInt(obj7); 
+        arg8 = (int)SWIG_As_int(obj7); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7642,14 +7773,14 @@ static PyObject *_wrap_HtmlDCRenderer_Render(PyObject *self, PyObject *args, PyO
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
     int result;
@@ -7668,21 +7799,21 @@ static PyObject *_wrap_HtmlDCRenderer_GetTotalHeight(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * HtmlDCRenderer_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlDCRenderer_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlDCRenderer, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlPrintout(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyHtmlPrintoutTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -7724,7 +7855,7 @@ static PyObject *_wrap_new_HtmlPrintout(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7757,7 +7888,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args,
         }
     }
     if (obj3) {
-        arg4 = (bool) SWIG_AsBool(obj3); 
+        arg4 = (bool)SWIG_As_bool(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7790,7 +7921,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlText(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7831,7 +7962,7 @@ static PyObject *_wrap_HtmlPrintout_SetHtmlFile(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7853,7 +7984,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7878,7 +8009,7 @@ static PyObject *_wrap_HtmlPrintout_SetHeader(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString *arg2 = 0 ;
@@ -7900,7 +8031,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -7925,7 +8056,7 @@ static PyObject *_wrap_HtmlPrintout_SetFooter(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     wxString arg2 ;
@@ -7971,7 +8102,7 @@ static PyObject *_wrap_HtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlPrintout_NormalizeFontSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     int arg2 = (int) -1 ;
@@ -7985,7 +8116,7 @@ static PyObject *_wrap_HtmlPrintout_NormalizeFontSizes(PyObject *self, PyObject
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8002,7 +8133,7 @@ static PyObject *_wrap_HtmlPrintout_NormalizeFontSizes(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlPrintout *arg1 = (wxHtmlPrintout *) 0 ;
     float arg2 = (float) 25.2 ;
@@ -8024,23 +8155,23 @@ static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *self, PyObject *args, P
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlPrintout,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (float) SWIG_AsFloat(obj1); 
+        arg2 = (float)SWIG_As_float(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (float) SWIG_AsFloat(obj2); 
+        arg3 = (float)SWIG_As_float(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
-        arg4 = (float) SWIG_AsFloat(obj3); 
+        arg4 = (float)SWIG_As_float(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
-        arg5 = (float) SWIG_AsFloat(obj4); 
+        arg5 = (float)SWIG_As_float(obj4); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj5) {
-        arg6 = (float) SWIG_AsFloat(obj5); 
+        arg6 = (float)SWIG_As_float(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8057,7 +8188,7 @@ static PyObject *_wrap_HtmlPrintout_SetMargins(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlPrintout_AddFilter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_AddFilter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlFilter *arg1 = (wxHtmlFilter *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8082,7 +8213,7 @@ static PyObject *_wrap_HtmlPrintout_AddFilter(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_HtmlPrintout_CleanUpStatics(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlPrintout_CleanUpStatics(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     char *kwnames[] = {
         NULL 
@@ -8103,14 +8234,14 @@ static PyObject *_wrap_HtmlPrintout_CleanUpStatics(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * HtmlPrintout_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlPrintout_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlPrintout, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString const &arg1_defvalue = wxPyHtmlPrintingTitleStr ;
     wxString *arg1 = (wxString *) &arg1_defvalue ;
@@ -8158,7 +8289,7 @@ static PyObject *_wrap_new_HtmlEasyPrinting(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_delete_HtmlEasyPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlEasyPrinting(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8183,7 +8314,7 @@ static PyObject *_wrap_delete_HtmlEasyPrinting(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8224,7 +8355,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewFile(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8284,7 +8415,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PreviewText(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8325,7 +8456,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8385,7 +8516,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrintText(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PrinterSetup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PrinterSetup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8410,7 +8541,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PrinterSetup(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_PageSetup(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_PageSetup(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     PyObject * obj0 = 0 ;
@@ -8435,7 +8566,7 @@ static PyObject *_wrap_HtmlEasyPrinting_PageSetup(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8457,7 +8588,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8482,7 +8613,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetHeader(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString *arg2 = 0 ;
@@ -8504,7 +8635,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8529,7 +8660,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFooter(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxString arg2 ;
@@ -8575,7 +8706,7 @@ static PyObject *_wrap_HtmlEasyPrinting_SetFonts(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_NormalizeFontSizes(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_NormalizeFontSizes(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     int arg2 = (int) -1 ;
@@ -8589,7 +8720,7 @@ static PyObject *_wrap_HtmlEasyPrinting_NormalizeFontSizes(PyObject *self, PyObj
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlEasyPrinting,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -8606,7 +8737,7 @@ static PyObject *_wrap_HtmlEasyPrinting_NormalizeFontSizes(PyObject *self, PyObj
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_GetPrintData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxPrintData *result;
@@ -8632,7 +8763,7 @@ static PyObject *_wrap_HtmlEasyPrinting_GetPrintData(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlEasyPrinting_GetPageSetupData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlEasyPrinting_GetPageSetupData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlEasyPrinting *arg1 = (wxHtmlEasyPrinting *) 0 ;
     wxPageSetupDialogData *result;
@@ -8658,14 +8789,14 @@ static PyObject *_wrap_HtmlEasyPrinting_GetPageSetupData(PyObject *self, PyObjec
 }
 
 
-static PyObject * HtmlEasyPrinting_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlEasyPrinting_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlEasyPrinting, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlBookRecord(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxString *arg1 = 0 ;
     wxString *arg2 = 0 ;
@@ -8751,7 +8882,7 @@ static PyObject *_wrap_new_HtmlBookRecord(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetBookFile(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetBookFile(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8783,7 +8914,7 @@ static PyObject *_wrap_HtmlBookRecord_GetBookFile(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8815,7 +8946,7 @@ static PyObject *_wrap_HtmlBookRecord_GetTitle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8847,7 +8978,7 @@ static PyObject *_wrap_HtmlBookRecord_GetStart(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetBasePath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetBasePath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString result;
@@ -8879,7 +9010,7 @@ static PyObject *_wrap_HtmlBookRecord_GetBasePath(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     int arg2 ;
@@ -8894,9 +9025,9 @@ static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *self, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlBookRecord_SetContentsRange",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlBookRecord,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -8912,7 +9043,7 @@ static PyObject *_wrap_HtmlBookRecord_SetContentsRange(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     int result;
@@ -8931,14 +9062,14 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsStart(PyObject *self, PyObject
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     int result;
@@ -8957,14 +9088,14 @@ static PyObject *_wrap_HtmlBookRecord_GetContentsEnd(PyObject *self, PyObject *a
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -9005,7 +9136,7 @@ static PyObject *_wrap_HtmlBookRecord_SetTitle(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -9046,7 +9177,7 @@ static PyObject *_wrap_HtmlBookRecord_SetBasePath(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -9087,7 +9218,7 @@ static PyObject *_wrap_HtmlBookRecord_SetStart(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlBookRecord *arg1 = (wxHtmlBookRecord *) 0 ;
     wxString *arg2 = 0 ;
@@ -9135,14 +9266,14 @@ static PyObject *_wrap_HtmlBookRecord_GetFullPath(PyObject *self, PyObject *args
 }
 
 
-static PyObject * HtmlBookRecord_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlBookRecord_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlBookRecord, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     int result;
@@ -9161,14 +9292,14 @@ static PyObject *_wrap_HtmlContentsItem_GetLevel(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     int result;
@@ -9187,14 +9318,14 @@ static PyObject *_wrap_HtmlContentsItem_GetID(PyObject *self, PyObject *args, Py
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     wxString result;
@@ -9226,7 +9357,7 @@ static PyObject *_wrap_HtmlContentsItem_GetName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     wxString result;
@@ -9258,7 +9389,7 @@ static PyObject *_wrap_HtmlContentsItem_GetPage(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlContentsItem *arg1 = (wxHtmlContentsItem *) 0 ;
     wxHtmlBookRecord *result;
@@ -9284,14 +9415,14 @@ static PyObject *_wrap_HtmlContentsItem_GetBook(PyObject *self, PyObject *args,
 }
 
 
-static PyObject * HtmlContentsItem_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlContentsItem_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlContentsItem, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     bool result;
@@ -9319,7 +9450,7 @@ static PyObject *_wrap_HtmlSearchStatus_Search(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     bool result;
@@ -9347,7 +9478,7 @@ static PyObject *_wrap_HtmlSearchStatus_IsActive(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     int result;
@@ -9366,14 +9497,14 @@ static PyObject *_wrap_HtmlSearchStatus_GetCurIndex(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     int result;
@@ -9392,14 +9523,14 @@ static PyObject *_wrap_HtmlSearchStatus_GetMaxIndex(PyObject *self, PyObject *ar
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     wxString *result;
@@ -9434,7 +9565,7 @@ static PyObject *_wrap_HtmlSearchStatus_GetName(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlSearchStatus *arg1 = (wxHtmlSearchStatus *) 0 ;
     wxHtmlContentsItem *result;
@@ -9460,14 +9591,14 @@ static PyObject *_wrap_HtmlSearchStatus_GetContentsItem(PyObject *self, PyObject
 }
 
 
-static PyObject * HtmlSearchStatus_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlSearchStatus_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlSearchStatus, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlHelpData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlHelpData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *result;
     char *kwnames[] = {
@@ -9489,7 +9620,7 @@ static PyObject *_wrap_new_HtmlHelpData(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_delete_HtmlHelpData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlHelpData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     PyObject * obj0 = 0 ;
@@ -9514,7 +9645,7 @@ static PyObject *_wrap_delete_HtmlHelpData(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
@@ -9555,7 +9686,7 @@ static PyObject *_wrap_HtmlHelpData_SetTempDir(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
@@ -9599,7 +9730,7 @@ static PyObject *_wrap_HtmlHelpData_AddBook(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxString *arg2 = 0 ;
@@ -9647,7 +9778,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageByName(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     int arg2 ;
@@ -9661,7 +9792,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *self, PyObject *args,
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpData_FindPageById",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlHelpData,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -9683,7 +9814,7 @@ static PyObject *_wrap_HtmlHelpData_FindPageById(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxHtmlBookRecArray *result;
@@ -9712,7 +9843,7 @@ static PyObject *_wrap_HtmlHelpData_GetBookRecArray(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxHtmlContentsItem *result;
@@ -9738,7 +9869,7 @@ static PyObject *_wrap_HtmlHelpData_GetContents(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     int result;
@@ -9757,14 +9888,14 @@ static PyObject *_wrap_HtmlHelpData_GetContentsCnt(PyObject *self, PyObject *arg
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     wxHtmlContentsItem *result;
@@ -9790,7 +9921,7 @@ static PyObject *_wrap_HtmlHelpData_GetIndex(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpData *arg1 = (wxHtmlHelpData *) 0 ;
     int result;
@@ -9809,21 +9940,21 @@ static PyObject *_wrap_HtmlHelpData_GetIndexCnt(PyObject *self, PyObject *args,
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;
     }
-    resultobj = SWIG_FromInt((int)result);
+    resultobj = SWIG_From_int((int)result);
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject * HtmlHelpData_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlHelpData_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlHelpData, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlHelpFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 ;
@@ -9845,7 +9976,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:new_HtmlHelpFrame",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj2) {
         {
@@ -9855,7 +9986,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec
         }
     }
     if (obj3) {
-        arg4 = (int) SWIG_AsInt(obj3); 
+        arg4 = (int)SWIG_As_int(obj3); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj4) {
@@ -9885,7 +10016,7 @@ static PyObject *_wrap_new_HtmlHelpFrame(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_GetData(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxHtmlHelpData *result;
@@ -9911,7 +10042,7 @@ static PyObject *_wrap_HtmlHelpFrame_GetData(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -9952,7 +10083,7 @@ static PyObject *_wrap_HtmlHelpFrame_SetTitleFormat(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -9993,7 +10124,7 @@ static PyObject *_wrap_HtmlHelpFrame_Display(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     int arg2 ;
@@ -10006,7 +10137,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *self, PyObject *args, P
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpFrame_DisplayID",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlHelpFrame,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10022,7 +10153,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayID(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_DisplayContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_DisplayContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10047,7 +10178,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayContents(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_DisplayIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_DisplayIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10072,7 +10203,7 @@ static PyObject *_wrap_HtmlHelpFrame_DisplayIndex(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxString *arg2 = 0 ;
@@ -10116,7 +10247,7 @@ static PyObject *_wrap_HtmlHelpFrame_KeywordSearch(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10164,7 +10295,7 @@ static PyObject *_wrap_HtmlHelpFrame_UseConfig(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10203,7 +10334,7 @@ static PyObject *_wrap_HtmlHelpFrame_ReadCustomization(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpFrame *arg1 = (wxHtmlHelpFrame *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10242,14 +10373,14 @@ static PyObject *_wrap_HtmlHelpFrame_WriteCustomization(PyObject *self, PyObject
 }
 
 
-static PyObject * HtmlHelpFrame_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlHelpFrame_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlHelpFrame, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_HtmlHelpController(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_HtmlHelpController(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     int arg1 = (int) wxHF_DEFAULTSTYLE ;
     wxHtmlHelpController *result;
@@ -10260,7 +10391,7 @@ static PyObject *_wrap_new_HtmlHelpController(PyObject *self, PyObject *args, Py
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_HtmlHelpController",kwnames,&obj0)) goto fail;
     if (obj0) {
-        arg1 = (int) SWIG_AsInt(obj0); 
+        arg1 = (int)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10278,7 +10409,7 @@ static PyObject *_wrap_new_HtmlHelpController(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject *_wrap_delete_HtmlHelpController(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_delete_HtmlHelpController(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10303,7 +10434,7 @@ static PyObject *_wrap_delete_HtmlHelpController(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10344,7 +10475,7 @@ static PyObject *_wrap_HtmlHelpController_SetTitleFormat(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10385,7 +10516,7 @@ static PyObject *_wrap_HtmlHelpController_SetTempDir(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10408,7 +10539,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args
         temp2 = True;
     }
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -10435,7 +10566,7 @@ static PyObject *_wrap_HtmlHelpController_AddBook(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_Display(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10476,7 +10607,7 @@ static PyObject *_wrap_HtmlHelpController_Display(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     int arg2 ;
@@ -10489,7 +10620,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *self, PyObject *ar
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlHelpController_DisplayID",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxHtmlHelpController,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -10505,7 +10636,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayID(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlHelpController_DisplayContents(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_DisplayContents(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10530,7 +10661,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayContents(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_HtmlHelpController_DisplayIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_DisplayIndex(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     PyObject * obj0 = 0 ;
@@ -10555,7 +10686,7 @@ static PyObject *_wrap_HtmlHelpController_DisplayIndex(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxString *arg2 = 0 ;
@@ -10599,7 +10730,7 @@ static PyObject *_wrap_HtmlHelpController_KeywordSearch(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10647,7 +10778,7 @@ static PyObject *_wrap_HtmlHelpController_UseConfig(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10686,7 +10817,7 @@ static PyObject *_wrap_HtmlHelpController_ReadCustomization(PyObject *self, PyOb
 }
 
 
-static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxConfigBase *arg2 = (wxConfigBase *) 0 ;
@@ -10725,7 +10856,7 @@ static PyObject *_wrap_HtmlHelpController_WriteCustomization(PyObject *self, PyO
 }
 
 
-static PyObject *_wrap_HtmlHelpController_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_HtmlHelpController_GetFrame(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxHtmlHelpController *arg1 = (wxHtmlHelpController *) 0 ;
     wxHtmlHelpFrame *result;
@@ -10751,7 +10882,7 @@ static PyObject *_wrap_HtmlHelpController_GetFrame(PyObject *self, PyObject *arg
 }
 
 
-static PyObject * HtmlHelpController_swigregister(PyObject *self, PyObject *args) {
+static PyObject * HtmlHelpController_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxHtmlHelpController, obj);
@@ -10759,325 +10890,325 @@ static PyObject * HtmlHelpController_swigregister(PyObject *self, PyObject *args
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_HtmlLinkInfo", (PyCFunction) _wrap_new_HtmlLinkInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_GetHref", (PyCFunction) _wrap_HtmlLinkInfo_GetHref, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_GetTarget", (PyCFunction) _wrap_HtmlLinkInfo_GetTarget, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_GetEvent", (PyCFunction) _wrap_HtmlLinkInfo_GetEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_GetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_GetHtmlCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_SetEvent", (PyCFunction) _wrap_HtmlLinkInfo_SetEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_SetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_SetHtmlCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlLinkInfo_swigregister", HtmlLinkInfo_swigregister, METH_VARARGS },
-        { (char *)"HtmlTag_GetName", (PyCFunction) _wrap_HtmlTag_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_HasParam", (PyCFunction) _wrap_HtmlTag_HasParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_GetParam", (PyCFunction) _wrap_HtmlTag_GetParam, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_GetAllParams", (PyCFunction) _wrap_HtmlTag_GetAllParams, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_HasEnding", (PyCFunction) _wrap_HtmlTag_HasEnding, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_GetBeginPos", (PyCFunction) _wrap_HtmlTag_GetBeginPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_GetEndPos1", (PyCFunction) _wrap_HtmlTag_GetEndPos1, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_GetEndPos2", (PyCFunction) _wrap_HtmlTag_GetEndPos2, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTag_swigregister", HtmlTag_swigregister, METH_VARARGS },
-        { (char *)"HtmlParser_SetFS", (PyCFunction) _wrap_HtmlParser_SetFS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_GetFS", (PyCFunction) _wrap_HtmlParser_GetFS, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_Parse", (PyCFunction) _wrap_HtmlParser_Parse, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_InitParser", (PyCFunction) _wrap_HtmlParser_InitParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_DoneParser", (PyCFunction) _wrap_HtmlParser_DoneParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_DoParsing", (PyCFunction) _wrap_HtmlParser_DoParsing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_StopParsing", (PyCFunction) _wrap_HtmlParser_StopParsing, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_AddTagHandler", (PyCFunction) _wrap_HtmlParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_GetSource", (PyCFunction) _wrap_HtmlParser_GetSource, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_PopTagHandler", (PyCFunction) _wrap_HtmlParser_PopTagHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetDC", (PyCFunction) _wrap_HtmlWinParser_GetDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction) _wrap_HtmlWinParser_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction) _wrap_HtmlWinParser_GetCharWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetWindow", (PyCFunction) _wrap_HtmlWinParser_GetWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_NormalizeFontSizes", (PyCFunction) _wrap_HtmlWinParser_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetContainer", (PyCFunction) _wrap_HtmlWinParser_GetContainer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_OpenContainer", (PyCFunction) _wrap_HtmlWinParser_OpenContainer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetContainer", (PyCFunction) _wrap_HtmlWinParser_SetContainer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_CloseContainer", (PyCFunction) _wrap_HtmlWinParser_CloseContainer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetFontSize", (PyCFunction) _wrap_HtmlWinParser_GetFontSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetFontSize", (PyCFunction) _wrap_HtmlWinParser_SetFontSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetFontBold", (PyCFunction) _wrap_HtmlWinParser_GetFontBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetFontBold", (PyCFunction) _wrap_HtmlWinParser_SetFontBold, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetFontItalic", (PyCFunction) _wrap_HtmlWinParser_GetFontItalic, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetFontItalic", (PyCFunction) _wrap_HtmlWinParser_SetFontItalic, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_GetFontUnderlined, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_SetFontUnderlined, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetFontFixed", (PyCFunction) _wrap_HtmlWinParser_GetFontFixed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetFontFixed", (PyCFunction) _wrap_HtmlWinParser_SetFontFixed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetAlign", (PyCFunction) _wrap_HtmlWinParser_GetAlign, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetAlign", (PyCFunction) _wrap_HtmlWinParser_SetAlign, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetLinkColor", (PyCFunction) _wrap_HtmlWinParser_GetLinkColor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetLinkColor", (PyCFunction) _wrap_HtmlWinParser_SetLinkColor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetActualColor", (PyCFunction) _wrap_HtmlWinParser_GetActualColor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetActualColor", (PyCFunction) _wrap_HtmlWinParser_SetActualColor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_SetLink", (PyCFunction) _wrap_HtmlWinParser_SetLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_CreateCurrentFont", (PyCFunction) _wrap_HtmlWinParser_CreateCurrentFont, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_GetLink", (PyCFunction) _wrap_HtmlWinParser_GetLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinParser_swigregister", HtmlWinParser_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlTagHandler", (PyCFunction) _wrap_new_HtmlTagHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTagHandler_SetParser", (PyCFunction) _wrap_HtmlTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTagHandler_GetParser", (PyCFunction) _wrap_HtmlTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTagHandler_ParseInner", (PyCFunction) _wrap_HtmlTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlTagHandler_swigregister", HtmlTagHandler_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlWinTagHandler", (PyCFunction) _wrap_new_HtmlWinTagHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlWinTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinTagHandler_SetParser", (PyCFunction) _wrap_HtmlWinTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinTagHandler_GetParser", (PyCFunction) _wrap_HtmlWinTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinTagHandler_ParseInner", (PyCFunction) _wrap_HtmlWinTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWinTagHandler_swigregister", HtmlWinTagHandler_swigregister, METH_VARARGS },
-        { (char *)"HtmlWinParser_AddTagHandler", (PyCFunction) _wrap_HtmlWinParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_HtmlSelection", (PyCFunction) _wrap_new_HtmlSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlSelection", (PyCFunction) _wrap_delete_HtmlSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_Set", (PyCFunction) _wrap_HtmlSelection_Set, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_SetCells", (PyCFunction) _wrap_HtmlSelection_SetCells, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_GetFromCell", (PyCFunction) _wrap_HtmlSelection_GetFromCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_GetToCell", (PyCFunction) _wrap_HtmlSelection_GetToCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_GetFromPos", (PyCFunction) _wrap_HtmlSelection_GetFromPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_GetToPos", (PyCFunction) _wrap_HtmlSelection_GetToPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_GetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_GetFromPrivPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_GetToPrivPos", (PyCFunction) _wrap_HtmlSelection_GetToPrivPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_SetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_SetFromPrivPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_SetToPrivPos", (PyCFunction) _wrap_HtmlSelection_SetToPrivPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_ClearPrivPos", (PyCFunction) _wrap_HtmlSelection_ClearPrivPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_IsEmpty", (PyCFunction) _wrap_HtmlSelection_IsEmpty, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSelection_swigregister", HtmlSelection_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlRenderingState", (PyCFunction) _wrap_new_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlRenderingState", (PyCFunction) _wrap_delete_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_SetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_SetSelectionState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_GetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_GetSelectionState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_SetFgColour", (PyCFunction) _wrap_HtmlRenderingState_SetFgColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_GetFgColour", (PyCFunction) _wrap_HtmlRenderingState_GetFgColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_SetBgColour", (PyCFunction) _wrap_HtmlRenderingState_SetBgColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_GetBgColour", (PyCFunction) _wrap_HtmlRenderingState_GetBgColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingState_swigregister", HtmlRenderingState_swigregister, METH_VARARGS },
-        { (char *)"HtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingStyle_swigregister", HtmlRenderingStyle_swigregister, METH_VARARGS },
-        { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"DefaultHtmlRenderingStyle_swigregister", DefaultHtmlRenderingStyle_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlRenderingInfo", (PyCFunction) _wrap_new_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlRenderingInfo", (PyCFunction) _wrap_delete_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingInfo_SetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_SetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingInfo_GetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_GetSelection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingInfo_SetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_SetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingInfo_GetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_GetStyle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingInfo_GetState", (PyCFunction) _wrap_HtmlRenderingInfo_GetState, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlRenderingInfo_swigregister", HtmlRenderingInfo_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlCell", (PyCFunction) _wrap_new_HtmlCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetPosX", (PyCFunction) _wrap_HtmlCell_GetPosX, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetPosY", (PyCFunction) _wrap_HtmlCell_GetPosY, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetWidth", (PyCFunction) _wrap_HtmlCell_GetWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetHeight", (PyCFunction) _wrap_HtmlCell_GetHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetDescent", (PyCFunction) _wrap_HtmlCell_GetDescent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetMaxTotalWidth", (PyCFunction) _wrap_HtmlCell_GetMaxTotalWidth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetId", (PyCFunction) _wrap_HtmlCell_GetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_SetId", (PyCFunction) _wrap_HtmlCell_SetId, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetLink", (PyCFunction) _wrap_HtmlCell_GetLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetNext", (PyCFunction) _wrap_HtmlCell_GetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetParent", (PyCFunction) _wrap_HtmlCell_GetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetFirstChild", (PyCFunction) _wrap_HtmlCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetCursor", (PyCFunction) _wrap_HtmlCell_GetCursor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_IsFormattingCell", (PyCFunction) _wrap_HtmlCell_IsFormattingCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_SetNext", (PyCFunction) _wrap_HtmlCell_SetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_SetParent", (PyCFunction) _wrap_HtmlCell_SetParent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_SetPos", (PyCFunction) _wrap_HtmlCell_SetPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_Layout", (PyCFunction) _wrap_HtmlCell_Layout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction) _wrap_HtmlCell_IsLinebreakAllowed, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_IsTerminalCell", (PyCFunction) _wrap_HtmlCell_IsTerminalCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction) _wrap_HtmlCell_GetFirstTerminal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetLastTerminal", (PyCFunction) _wrap_HtmlCell_GetLastTerminal, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_GetDepth", (PyCFunction) _wrap_HtmlCell_GetDepth, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_IsBefore", (PyCFunction) _wrap_HtmlCell_IsBefore, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_ConvertToText", (PyCFunction) _wrap_HtmlCell_ConvertToText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlCell_swigregister", HtmlCell_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlWordCell", (PyCFunction) _wrap_new_HtmlWordCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWordCell_swigregister", HtmlWordCell_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlContainerCell", (PyCFunction) _wrap_new_HtmlContainerCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_InsertCell", (PyCFunction) _wrap_HtmlContainerCell_InsertCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_SetAlignHor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_GetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_GetAlignHor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_SetAlignVer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_GetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_GetAlignVer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetIndent", (PyCFunction) _wrap_HtmlContainerCell_SetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_GetIndent", (PyCFunction) _wrap_HtmlContainerCell_GetIndent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_GetIndentUnits", (PyCFunction) _wrap_HtmlContainerCell_GetIndentUnits, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetAlign", (PyCFunction) _wrap_HtmlContainerCell_SetAlign, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetWidthFloat", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetWidthFloatFromTag", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloatFromTag, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetMinHeight", (PyCFunction) _wrap_HtmlContainerCell_SetMinHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_SetBorder", (PyCFunction) _wrap_HtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_GetFirstChild", (PyCFunction) _wrap_HtmlContainerCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContainerCell_swigregister", HtmlContainerCell_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlColourCell", (PyCFunction) _wrap_new_HtmlColourCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlColourCell_swigregister", HtmlColourCell_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlFontCell", (PyCFunction) _wrap_new_HtmlFontCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlFontCell_swigregister", HtmlFontCell_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlWidgetCell", (PyCFunction) _wrap_new_HtmlWidgetCell, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWidgetCell_swigregister", HtmlWidgetCell_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlFilter", (PyCFunction) _wrap_new_HtmlFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreHtmlWindow", (PyCFunction) _wrap_new_PreHtmlWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow__setCallbackInfo", (PyCFunction) _wrap_HtmlWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SetPage", (PyCFunction) _wrap_HtmlWindow_SetPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_LoadPage", (PyCFunction) _wrap_HtmlWindow_LoadPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_LoadFile", (PyCFunction) _wrap_HtmlWindow_LoadFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_AppendToPage", (PyCFunction) _wrap_HtmlWindow_AppendToPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetOpenedPage", (PyCFunction) _wrap_HtmlWindow_GetOpenedPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetOpenedAnchor", (PyCFunction) _wrap_HtmlWindow_GetOpenedAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetOpenedPageTitle", (PyCFunction) _wrap_HtmlWindow_GetOpenedPageTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_SetRelatedFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_GetRelatedFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SetRelatedStatusBar", (PyCFunction) _wrap_HtmlWindow_SetRelatedStatusBar, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SetFonts", (PyCFunction) _wrap_HtmlWindow_SetFonts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_NormalizeFontSizes", (PyCFunction) _wrap_HtmlWindow_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SetTitle", (PyCFunction) _wrap_HtmlWindow_SetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SetBorders", (PyCFunction) _wrap_HtmlWindow_SetBorders, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_ReadCustomization", (PyCFunction) _wrap_HtmlWindow_ReadCustomization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_WriteCustomization", (PyCFunction) _wrap_HtmlWindow_WriteCustomization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_HistoryBack", (PyCFunction) _wrap_HtmlWindow_HistoryBack, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_HistoryForward", (PyCFunction) _wrap_HtmlWindow_HistoryForward, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_HistoryCanBack", (PyCFunction) _wrap_HtmlWindow_HistoryCanBack, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_HistoryCanForward", (PyCFunction) _wrap_HtmlWindow_HistoryCanForward, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_HistoryClear", (PyCFunction) _wrap_HtmlWindow_HistoryClear, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetInternalRepresentation", (PyCFunction) _wrap_HtmlWindow_GetInternalRepresentation, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetParser", (PyCFunction) _wrap_HtmlWindow_GetParser, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_base_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_base_OnCellClicked, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlDCRenderer", (PyCFunction) _wrap_new_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlDCRenderer", (PyCFunction) _wrap_delete_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_SetDC", (PyCFunction) _wrap_HtmlDCRenderer_SetDC, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_SetSize", (PyCFunction) _wrap_HtmlDCRenderer_SetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_SetHtmlText", (PyCFunction) _wrap_HtmlDCRenderer_SetHtmlText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_SetFonts", (PyCFunction) _wrap_HtmlDCRenderer_SetFonts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_NormalizeFontSizes", (PyCFunction) _wrap_HtmlDCRenderer_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_Render", (PyCFunction) _wrap_HtmlDCRenderer_Render, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_GetTotalHeight", (PyCFunction) _wrap_HtmlDCRenderer_GetTotalHeight, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlDCRenderer_swigregister", HtmlDCRenderer_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlPrintout", (PyCFunction) _wrap_new_HtmlPrintout, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_SetHtmlText", (PyCFunction) _wrap_HtmlPrintout_SetHtmlText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_SetHtmlFile", (PyCFunction) _wrap_HtmlPrintout_SetHtmlFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_SetHeader", (PyCFunction) _wrap_HtmlPrintout_SetHeader, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_SetFooter", (PyCFunction) _wrap_HtmlPrintout_SetFooter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_SetFonts", (PyCFunction) _wrap_HtmlPrintout_SetFonts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_NormalizeFontSizes", (PyCFunction) _wrap_HtmlPrintout_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_SetMargins", (PyCFunction) _wrap_HtmlPrintout_SetMargins, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_AddFilter", (PyCFunction) _wrap_HtmlPrintout_AddFilter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_CleanUpStatics", (PyCFunction) _wrap_HtmlPrintout_CleanUpStatics, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlPrintout_swigregister", HtmlPrintout_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlEasyPrinting", (PyCFunction) _wrap_new_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlEasyPrinting", (PyCFunction) _wrap_delete_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_PreviewFile", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_PreviewText", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_PrintFile", (PyCFunction) _wrap_HtmlEasyPrinting_PrintFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_PrintText", (PyCFunction) _wrap_HtmlEasyPrinting_PrintText, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_PrinterSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PrinterSetup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_PageSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PageSetup, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_SetHeader", (PyCFunction) _wrap_HtmlEasyPrinting_SetHeader, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_SetFooter", (PyCFunction) _wrap_HtmlEasyPrinting_SetFooter, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_SetFonts", (PyCFunction) _wrap_HtmlEasyPrinting_SetFonts, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_NormalizeFontSizes", (PyCFunction) _wrap_HtmlEasyPrinting_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_GetPrintData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPrintData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_GetPageSetupData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPageSetupData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlEasyPrinting_swigregister", HtmlEasyPrinting_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlBookRecord", (PyCFunction) _wrap_new_HtmlBookRecord, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetBookFile", (PyCFunction) _wrap_HtmlBookRecord_GetBookFile, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetTitle", (PyCFunction) _wrap_HtmlBookRecord_GetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetStart", (PyCFunction) _wrap_HtmlBookRecord_GetStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetBasePath", (PyCFunction) _wrap_HtmlBookRecord_GetBasePath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_SetContentsRange", (PyCFunction) _wrap_HtmlBookRecord_SetContentsRange, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetContentsStart", (PyCFunction) _wrap_HtmlBookRecord_GetContentsStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetContentsEnd", (PyCFunction) _wrap_HtmlBookRecord_GetContentsEnd, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_SetTitle", (PyCFunction) _wrap_HtmlBookRecord_SetTitle, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_SetBasePath", (PyCFunction) _wrap_HtmlBookRecord_SetBasePath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_SetStart", (PyCFunction) _wrap_HtmlBookRecord_SetStart, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_GetFullPath", (PyCFunction) _wrap_HtmlBookRecord_GetFullPath, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlBookRecord_swigregister", HtmlBookRecord_swigregister, METH_VARARGS },
-        { (char *)"HtmlContentsItem_GetLevel", (PyCFunction) _wrap_HtmlContentsItem_GetLevel, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContentsItem_GetID", (PyCFunction) _wrap_HtmlContentsItem_GetID, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContentsItem_GetName", (PyCFunction) _wrap_HtmlContentsItem_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContentsItem_GetPage", (PyCFunction) _wrap_HtmlContentsItem_GetPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContentsItem_GetBook", (PyCFunction) _wrap_HtmlContentsItem_GetBook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlContentsItem_swigregister", HtmlContentsItem_swigregister, METH_VARARGS },
-        { (char *)"HtmlSearchStatus_Search", (PyCFunction) _wrap_HtmlSearchStatus_Search, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSearchStatus_IsActive", (PyCFunction) _wrap_HtmlSearchStatus_IsActive, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSearchStatus_GetCurIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetCurIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSearchStatus_GetMaxIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetMaxIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSearchStatus_GetName", (PyCFunction) _wrap_HtmlSearchStatus_GetName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSearchStatus_GetContentsItem", (PyCFunction) _wrap_HtmlSearchStatus_GetContentsItem, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlSearchStatus_swigregister", HtmlSearchStatus_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlHelpData", (PyCFunction) _wrap_new_HtmlHelpData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlHelpData", (PyCFunction) _wrap_delete_HtmlHelpData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_SetTempDir", (PyCFunction) _wrap_HtmlHelpData_SetTempDir, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_AddBook", (PyCFunction) _wrap_HtmlHelpData_AddBook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_FindPageByName", (PyCFunction) _wrap_HtmlHelpData_FindPageByName, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_FindPageById", (PyCFunction) _wrap_HtmlHelpData_FindPageById, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_GetBookRecArray", (PyCFunction) _wrap_HtmlHelpData_GetBookRecArray, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_GetContents", (PyCFunction) _wrap_HtmlHelpData_GetContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_GetContentsCnt", (PyCFunction) _wrap_HtmlHelpData_GetContentsCnt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_GetIndex", (PyCFunction) _wrap_HtmlHelpData_GetIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_GetIndexCnt", (PyCFunction) _wrap_HtmlHelpData_GetIndexCnt, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpData_swigregister", HtmlHelpData_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_GetData", (PyCFunction) _wrap_HtmlHelpFrame_GetData, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpFrame_SetTitleFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_Display", (PyCFunction) _wrap_HtmlHelpFrame_Display, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_DisplayID", (PyCFunction) _wrap_HtmlHelpFrame_DisplayID, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_DisplayContents", (PyCFunction) _wrap_HtmlHelpFrame_DisplayContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_DisplayIndex", (PyCFunction) _wrap_HtmlHelpFrame_DisplayIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_KeywordSearch", (PyCFunction) _wrap_HtmlHelpFrame_KeywordSearch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_UseConfig", (PyCFunction) _wrap_HtmlHelpFrame_UseConfig, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_ReadCustomization", (PyCFunction) _wrap_HtmlHelpFrame_ReadCustomization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_WriteCustomization", (PyCFunction) _wrap_HtmlHelpFrame_WriteCustomization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpFrame_swigregister", HtmlHelpFrame_swigregister, METH_VARARGS },
-        { (char *)"new_HtmlHelpController", (PyCFunction) _wrap_new_HtmlHelpController, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"delete_HtmlHelpController", (PyCFunction) _wrap_delete_HtmlHelpController, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpController_SetTitleFormat, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_SetTempDir", (PyCFunction) _wrap_HtmlHelpController_SetTempDir, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_AddBook", (PyCFunction) _wrap_HtmlHelpController_AddBook, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_Display", (PyCFunction) _wrap_HtmlHelpController_Display, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_DisplayID", (PyCFunction) _wrap_HtmlHelpController_DisplayID, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_DisplayContents", (PyCFunction) _wrap_HtmlHelpController_DisplayContents, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_DisplayIndex", (PyCFunction) _wrap_HtmlHelpController_DisplayIndex, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_KeywordSearch", (PyCFunction) _wrap_HtmlHelpController_KeywordSearch, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_UseConfig", (PyCFunction) _wrap_HtmlHelpController_UseConfig, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_ReadCustomization", (PyCFunction) _wrap_HtmlHelpController_ReadCustomization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_WriteCustomization", (PyCFunction) _wrap_HtmlHelpController_WriteCustomization, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_GetFrame", (PyCFunction) _wrap_HtmlHelpController_GetFrame, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"HtmlHelpController_swigregister", HtmlHelpController_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_HtmlLinkInfo", (PyCFunction) _wrap_new_HtmlLinkInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_GetHref", (PyCFunction) _wrap_HtmlLinkInfo_GetHref, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_GetTarget", (PyCFunction) _wrap_HtmlLinkInfo_GetTarget, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_GetEvent", (PyCFunction) _wrap_HtmlLinkInfo_GetEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_GetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_GetHtmlCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_SetEvent", (PyCFunction) _wrap_HtmlLinkInfo_SetEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_SetHtmlCell", (PyCFunction) _wrap_HtmlLinkInfo_SetHtmlCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlLinkInfo_swigregister", HtmlLinkInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"HtmlTag_GetName", (PyCFunction) _wrap_HtmlTag_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_HasParam", (PyCFunction) _wrap_HtmlTag_HasParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_GetParam", (PyCFunction) _wrap_HtmlTag_GetParam, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_GetAllParams", (PyCFunction) _wrap_HtmlTag_GetAllParams, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_HasEnding", (PyCFunction) _wrap_HtmlTag_HasEnding, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_GetBeginPos", (PyCFunction) _wrap_HtmlTag_GetBeginPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_GetEndPos1", (PyCFunction) _wrap_HtmlTag_GetEndPos1, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_GetEndPos2", (PyCFunction) _wrap_HtmlTag_GetEndPos2, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTag_swigregister", HtmlTag_swigregister, METH_VARARGS, NULL },
+        { (char *)"HtmlParser_SetFS", (PyCFunction) _wrap_HtmlParser_SetFS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_GetFS", (PyCFunction) _wrap_HtmlParser_GetFS, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_Parse", (PyCFunction) _wrap_HtmlParser_Parse, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_InitParser", (PyCFunction) _wrap_HtmlParser_InitParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_DoneParser", (PyCFunction) _wrap_HtmlParser_DoneParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_DoParsing", (PyCFunction) _wrap_HtmlParser_DoParsing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_StopParsing", (PyCFunction) _wrap_HtmlParser_StopParsing, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_AddTagHandler", (PyCFunction) _wrap_HtmlParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_GetSource", (PyCFunction) _wrap_HtmlParser_GetSource, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_PopTagHandler", (PyCFunction) _wrap_HtmlParser_PopTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetDC", (PyCFunction) _wrap_HtmlWinParser_GetDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction) _wrap_HtmlWinParser_GetCharHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction) _wrap_HtmlWinParser_GetCharWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetWindow", (PyCFunction) _wrap_HtmlWinParser_GetWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_NormalizeFontSizes", (PyCFunction) _wrap_HtmlWinParser_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetContainer", (PyCFunction) _wrap_HtmlWinParser_GetContainer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_OpenContainer", (PyCFunction) _wrap_HtmlWinParser_OpenContainer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetContainer", (PyCFunction) _wrap_HtmlWinParser_SetContainer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_CloseContainer", (PyCFunction) _wrap_HtmlWinParser_CloseContainer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetFontSize", (PyCFunction) _wrap_HtmlWinParser_GetFontSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetFontSize", (PyCFunction) _wrap_HtmlWinParser_SetFontSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetFontBold", (PyCFunction) _wrap_HtmlWinParser_GetFontBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetFontBold", (PyCFunction) _wrap_HtmlWinParser_SetFontBold, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetFontItalic", (PyCFunction) _wrap_HtmlWinParser_GetFontItalic, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetFontItalic", (PyCFunction) _wrap_HtmlWinParser_SetFontItalic, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_GetFontUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetFontUnderlined", (PyCFunction) _wrap_HtmlWinParser_SetFontUnderlined, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetFontFixed", (PyCFunction) _wrap_HtmlWinParser_GetFontFixed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetFontFixed", (PyCFunction) _wrap_HtmlWinParser_SetFontFixed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetAlign", (PyCFunction) _wrap_HtmlWinParser_GetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetAlign", (PyCFunction) _wrap_HtmlWinParser_SetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetLinkColor", (PyCFunction) _wrap_HtmlWinParser_GetLinkColor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetLinkColor", (PyCFunction) _wrap_HtmlWinParser_SetLinkColor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetActualColor", (PyCFunction) _wrap_HtmlWinParser_GetActualColor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetActualColor", (PyCFunction) _wrap_HtmlWinParser_SetActualColor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_SetLink", (PyCFunction) _wrap_HtmlWinParser_SetLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_CreateCurrentFont", (PyCFunction) _wrap_HtmlWinParser_CreateCurrentFont, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_GetLink", (PyCFunction) _wrap_HtmlWinParser_GetLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinParser_swigregister", HtmlWinParser_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlTagHandler", (PyCFunction) _wrap_new_HtmlTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTagHandler_SetParser", (PyCFunction) _wrap_HtmlTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTagHandler_GetParser", (PyCFunction) _wrap_HtmlTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTagHandler_ParseInner", (PyCFunction) _wrap_HtmlTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlTagHandler_swigregister", HtmlTagHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlWinTagHandler", (PyCFunction) _wrap_new_HtmlWinTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinTagHandler__setCallbackInfo", (PyCFunction) _wrap_HtmlWinTagHandler__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinTagHandler_SetParser", (PyCFunction) _wrap_HtmlWinTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinTagHandler_GetParser", (PyCFunction) _wrap_HtmlWinTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinTagHandler_ParseInner", (PyCFunction) _wrap_HtmlWinTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWinTagHandler_swigregister", HtmlWinTagHandler_swigregister, METH_VARARGS, NULL },
+        { (char *)"HtmlWinParser_AddTagHandler", (PyCFunction) _wrap_HtmlWinParser_AddTagHandler, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_HtmlSelection", (PyCFunction) _wrap_new_HtmlSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlSelection", (PyCFunction) _wrap_delete_HtmlSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_Set", (PyCFunction) _wrap_HtmlSelection_Set, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_SetCells", (PyCFunction) _wrap_HtmlSelection_SetCells, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_GetFromCell", (PyCFunction) _wrap_HtmlSelection_GetFromCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_GetToCell", (PyCFunction) _wrap_HtmlSelection_GetToCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_GetFromPos", (PyCFunction) _wrap_HtmlSelection_GetFromPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_GetToPos", (PyCFunction) _wrap_HtmlSelection_GetToPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_GetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_GetFromPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_GetToPrivPos", (PyCFunction) _wrap_HtmlSelection_GetToPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_SetFromPrivPos", (PyCFunction) _wrap_HtmlSelection_SetFromPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_SetToPrivPos", (PyCFunction) _wrap_HtmlSelection_SetToPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_ClearPrivPos", (PyCFunction) _wrap_HtmlSelection_ClearPrivPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_IsEmpty", (PyCFunction) _wrap_HtmlSelection_IsEmpty, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSelection_swigregister", HtmlSelection_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlRenderingState", (PyCFunction) _wrap_new_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlRenderingState", (PyCFunction) _wrap_delete_HtmlRenderingState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_SetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_SetSelectionState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_GetSelectionState", (PyCFunction) _wrap_HtmlRenderingState_GetSelectionState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_SetFgColour", (PyCFunction) _wrap_HtmlRenderingState_SetFgColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_GetFgColour", (PyCFunction) _wrap_HtmlRenderingState_GetFgColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_SetBgColour", (PyCFunction) _wrap_HtmlRenderingState_SetBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_GetBgColour", (PyCFunction) _wrap_HtmlRenderingState_GetBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingState_swigregister", HtmlRenderingState_swigregister, METH_VARARGS, NULL },
+        { (char *)"HtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_HtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingStyle_swigregister", HtmlRenderingStyle_swigregister, METH_VARARGS, NULL },
+        { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DefaultHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_DefaultHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"DefaultHtmlRenderingStyle_swigregister", DefaultHtmlRenderingStyle_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlRenderingInfo", (PyCFunction) _wrap_new_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlRenderingInfo", (PyCFunction) _wrap_delete_HtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingInfo_SetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_SetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingInfo_GetSelection", (PyCFunction) _wrap_HtmlRenderingInfo_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingInfo_SetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingInfo_GetStyle", (PyCFunction) _wrap_HtmlRenderingInfo_GetStyle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingInfo_GetState", (PyCFunction) _wrap_HtmlRenderingInfo_GetState, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlRenderingInfo_swigregister", HtmlRenderingInfo_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlCell", (PyCFunction) _wrap_new_HtmlCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetPosX", (PyCFunction) _wrap_HtmlCell_GetPosX, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetPosY", (PyCFunction) _wrap_HtmlCell_GetPosY, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetWidth", (PyCFunction) _wrap_HtmlCell_GetWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetHeight", (PyCFunction) _wrap_HtmlCell_GetHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetDescent", (PyCFunction) _wrap_HtmlCell_GetDescent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetMaxTotalWidth", (PyCFunction) _wrap_HtmlCell_GetMaxTotalWidth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetId", (PyCFunction) _wrap_HtmlCell_GetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_SetId", (PyCFunction) _wrap_HtmlCell_SetId, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetLink", (PyCFunction) _wrap_HtmlCell_GetLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetNext", (PyCFunction) _wrap_HtmlCell_GetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetParent", (PyCFunction) _wrap_HtmlCell_GetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetFirstChild", (PyCFunction) _wrap_HtmlCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetCursor", (PyCFunction) _wrap_HtmlCell_GetCursor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_IsFormattingCell", (PyCFunction) _wrap_HtmlCell_IsFormattingCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_SetNext", (PyCFunction) _wrap_HtmlCell_SetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_SetParent", (PyCFunction) _wrap_HtmlCell_SetParent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_SetPos", (PyCFunction) _wrap_HtmlCell_SetPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_Layout", (PyCFunction) _wrap_HtmlCell_Layout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction) _wrap_HtmlCell_IsLinebreakAllowed, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_IsTerminalCell", (PyCFunction) _wrap_HtmlCell_IsTerminalCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction) _wrap_HtmlCell_GetFirstTerminal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetLastTerminal", (PyCFunction) _wrap_HtmlCell_GetLastTerminal, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_GetDepth", (PyCFunction) _wrap_HtmlCell_GetDepth, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_IsBefore", (PyCFunction) _wrap_HtmlCell_IsBefore, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_ConvertToText", (PyCFunction) _wrap_HtmlCell_ConvertToText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlCell_swigregister", HtmlCell_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlWordCell", (PyCFunction) _wrap_new_HtmlWordCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWordCell_swigregister", HtmlWordCell_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlContainerCell", (PyCFunction) _wrap_new_HtmlContainerCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_InsertCell", (PyCFunction) _wrap_HtmlContainerCell_InsertCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_SetAlignHor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_GetAlignHor", (PyCFunction) _wrap_HtmlContainerCell_GetAlignHor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_SetAlignVer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_GetAlignVer", (PyCFunction) _wrap_HtmlContainerCell_GetAlignVer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetIndent", (PyCFunction) _wrap_HtmlContainerCell_SetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_GetIndent", (PyCFunction) _wrap_HtmlContainerCell_GetIndent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_GetIndentUnits", (PyCFunction) _wrap_HtmlContainerCell_GetIndentUnits, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetAlign", (PyCFunction) _wrap_HtmlContainerCell_SetAlign, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetWidthFloat", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetWidthFloatFromTag", (PyCFunction) _wrap_HtmlContainerCell_SetWidthFloatFromTag, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetMinHeight", (PyCFunction) _wrap_HtmlContainerCell_SetMinHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_HtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_SetBorder", (PyCFunction) _wrap_HtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_GetFirstChild", (PyCFunction) _wrap_HtmlContainerCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContainerCell_swigregister", HtmlContainerCell_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlColourCell", (PyCFunction) _wrap_new_HtmlColourCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlColourCell_swigregister", HtmlColourCell_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlFontCell", (PyCFunction) _wrap_new_HtmlFontCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlFontCell_swigregister", HtmlFontCell_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlWidgetCell", (PyCFunction) _wrap_new_HtmlWidgetCell, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWidgetCell_swigregister", HtmlWidgetCell_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlFilter", (PyCFunction) _wrap_new_HtmlFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreHtmlWindow", (PyCFunction) _wrap_new_PreHtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow__setCallbackInfo", (PyCFunction) _wrap_HtmlWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SetPage", (PyCFunction) _wrap_HtmlWindow_SetPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_LoadPage", (PyCFunction) _wrap_HtmlWindow_LoadPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_LoadFile", (PyCFunction) _wrap_HtmlWindow_LoadFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_AppendToPage", (PyCFunction) _wrap_HtmlWindow_AppendToPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetOpenedPage", (PyCFunction) _wrap_HtmlWindow_GetOpenedPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetOpenedAnchor", (PyCFunction) _wrap_HtmlWindow_GetOpenedAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetOpenedPageTitle", (PyCFunction) _wrap_HtmlWindow_GetOpenedPageTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_SetRelatedFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetRelatedFrame", (PyCFunction) _wrap_HtmlWindow_GetRelatedFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SetRelatedStatusBar", (PyCFunction) _wrap_HtmlWindow_SetRelatedStatusBar, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SetFonts", (PyCFunction) _wrap_HtmlWindow_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_NormalizeFontSizes", (PyCFunction) _wrap_HtmlWindow_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SetTitle", (PyCFunction) _wrap_HtmlWindow_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SetBorders", (PyCFunction) _wrap_HtmlWindow_SetBorders, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_ReadCustomization", (PyCFunction) _wrap_HtmlWindow_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_WriteCustomization", (PyCFunction) _wrap_HtmlWindow_WriteCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_HistoryBack", (PyCFunction) _wrap_HtmlWindow_HistoryBack, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_HistoryForward", (PyCFunction) _wrap_HtmlWindow_HistoryForward, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_HistoryCanBack", (PyCFunction) _wrap_HtmlWindow_HistoryCanBack, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_HistoryCanForward", (PyCFunction) _wrap_HtmlWindow_HistoryCanForward, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_HistoryClear", (PyCFunction) _wrap_HtmlWindow_HistoryClear, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetInternalRepresentation", (PyCFunction) _wrap_HtmlWindow_GetInternalRepresentation, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetParser", (PyCFunction) _wrap_HtmlWindow_GetParser, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_base_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_base_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlDCRenderer", (PyCFunction) _wrap_new_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlDCRenderer", (PyCFunction) _wrap_delete_HtmlDCRenderer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_SetDC", (PyCFunction) _wrap_HtmlDCRenderer_SetDC, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_SetSize", (PyCFunction) _wrap_HtmlDCRenderer_SetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_SetHtmlText", (PyCFunction) _wrap_HtmlDCRenderer_SetHtmlText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_SetFonts", (PyCFunction) _wrap_HtmlDCRenderer_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_NormalizeFontSizes", (PyCFunction) _wrap_HtmlDCRenderer_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_Render", (PyCFunction) _wrap_HtmlDCRenderer_Render, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_GetTotalHeight", (PyCFunction) _wrap_HtmlDCRenderer_GetTotalHeight, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlDCRenderer_swigregister", HtmlDCRenderer_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlPrintout", (PyCFunction) _wrap_new_HtmlPrintout, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_SetHtmlText", (PyCFunction) _wrap_HtmlPrintout_SetHtmlText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_SetHtmlFile", (PyCFunction) _wrap_HtmlPrintout_SetHtmlFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_SetHeader", (PyCFunction) _wrap_HtmlPrintout_SetHeader, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_SetFooter", (PyCFunction) _wrap_HtmlPrintout_SetFooter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_SetFonts", (PyCFunction) _wrap_HtmlPrintout_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_NormalizeFontSizes", (PyCFunction) _wrap_HtmlPrintout_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_SetMargins", (PyCFunction) _wrap_HtmlPrintout_SetMargins, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_AddFilter", (PyCFunction) _wrap_HtmlPrintout_AddFilter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_CleanUpStatics", (PyCFunction) _wrap_HtmlPrintout_CleanUpStatics, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlPrintout_swigregister", HtmlPrintout_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlEasyPrinting", (PyCFunction) _wrap_new_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlEasyPrinting", (PyCFunction) _wrap_delete_HtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_PreviewFile", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_PreviewText", (PyCFunction) _wrap_HtmlEasyPrinting_PreviewText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_PrintFile", (PyCFunction) _wrap_HtmlEasyPrinting_PrintFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_PrintText", (PyCFunction) _wrap_HtmlEasyPrinting_PrintText, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_PrinterSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PrinterSetup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_PageSetup", (PyCFunction) _wrap_HtmlEasyPrinting_PageSetup, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_SetHeader", (PyCFunction) _wrap_HtmlEasyPrinting_SetHeader, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_SetFooter", (PyCFunction) _wrap_HtmlEasyPrinting_SetFooter, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_SetFonts", (PyCFunction) _wrap_HtmlEasyPrinting_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_NormalizeFontSizes", (PyCFunction) _wrap_HtmlEasyPrinting_NormalizeFontSizes, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_GetPrintData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPrintData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_GetPageSetupData", (PyCFunction) _wrap_HtmlEasyPrinting_GetPageSetupData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlEasyPrinting_swigregister", HtmlEasyPrinting_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlBookRecord", (PyCFunction) _wrap_new_HtmlBookRecord, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetBookFile", (PyCFunction) _wrap_HtmlBookRecord_GetBookFile, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetTitle", (PyCFunction) _wrap_HtmlBookRecord_GetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetStart", (PyCFunction) _wrap_HtmlBookRecord_GetStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetBasePath", (PyCFunction) _wrap_HtmlBookRecord_GetBasePath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_SetContentsRange", (PyCFunction) _wrap_HtmlBookRecord_SetContentsRange, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetContentsStart", (PyCFunction) _wrap_HtmlBookRecord_GetContentsStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetContentsEnd", (PyCFunction) _wrap_HtmlBookRecord_GetContentsEnd, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_SetTitle", (PyCFunction) _wrap_HtmlBookRecord_SetTitle, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_SetBasePath", (PyCFunction) _wrap_HtmlBookRecord_SetBasePath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_SetStart", (PyCFunction) _wrap_HtmlBookRecord_SetStart, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_GetFullPath", (PyCFunction) _wrap_HtmlBookRecord_GetFullPath, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlBookRecord_swigregister", HtmlBookRecord_swigregister, METH_VARARGS, NULL },
+        { (char *)"HtmlContentsItem_GetLevel", (PyCFunction) _wrap_HtmlContentsItem_GetLevel, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContentsItem_GetID", (PyCFunction) _wrap_HtmlContentsItem_GetID, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContentsItem_GetName", (PyCFunction) _wrap_HtmlContentsItem_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContentsItem_GetPage", (PyCFunction) _wrap_HtmlContentsItem_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContentsItem_GetBook", (PyCFunction) _wrap_HtmlContentsItem_GetBook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlContentsItem_swigregister", HtmlContentsItem_swigregister, METH_VARARGS, NULL },
+        { (char *)"HtmlSearchStatus_Search", (PyCFunction) _wrap_HtmlSearchStatus_Search, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSearchStatus_IsActive", (PyCFunction) _wrap_HtmlSearchStatus_IsActive, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSearchStatus_GetCurIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetCurIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSearchStatus_GetMaxIndex", (PyCFunction) _wrap_HtmlSearchStatus_GetMaxIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSearchStatus_GetName", (PyCFunction) _wrap_HtmlSearchStatus_GetName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSearchStatus_GetContentsItem", (PyCFunction) _wrap_HtmlSearchStatus_GetContentsItem, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlSearchStatus_swigregister", HtmlSearchStatus_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlHelpData", (PyCFunction) _wrap_new_HtmlHelpData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlHelpData", (PyCFunction) _wrap_delete_HtmlHelpData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_SetTempDir", (PyCFunction) _wrap_HtmlHelpData_SetTempDir, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_AddBook", (PyCFunction) _wrap_HtmlHelpData_AddBook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_FindPageByName", (PyCFunction) _wrap_HtmlHelpData_FindPageByName, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_FindPageById", (PyCFunction) _wrap_HtmlHelpData_FindPageById, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_GetBookRecArray", (PyCFunction) _wrap_HtmlHelpData_GetBookRecArray, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_GetContents", (PyCFunction) _wrap_HtmlHelpData_GetContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_GetContentsCnt", (PyCFunction) _wrap_HtmlHelpData_GetContentsCnt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_GetIndex", (PyCFunction) _wrap_HtmlHelpData_GetIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_GetIndexCnt", (PyCFunction) _wrap_HtmlHelpData_GetIndexCnt, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpData_swigregister", HtmlHelpData_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlHelpFrame", (PyCFunction) _wrap_new_HtmlHelpFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_GetData", (PyCFunction) _wrap_HtmlHelpFrame_GetData, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpFrame_SetTitleFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_Display", (PyCFunction) _wrap_HtmlHelpFrame_Display, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_DisplayID", (PyCFunction) _wrap_HtmlHelpFrame_DisplayID, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_DisplayContents", (PyCFunction) _wrap_HtmlHelpFrame_DisplayContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_DisplayIndex", (PyCFunction) _wrap_HtmlHelpFrame_DisplayIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_KeywordSearch", (PyCFunction) _wrap_HtmlHelpFrame_KeywordSearch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_UseConfig", (PyCFunction) _wrap_HtmlHelpFrame_UseConfig, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_ReadCustomization", (PyCFunction) _wrap_HtmlHelpFrame_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_WriteCustomization", (PyCFunction) _wrap_HtmlHelpFrame_WriteCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpFrame_swigregister", HtmlHelpFrame_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_HtmlHelpController", (PyCFunction) _wrap_new_HtmlHelpController, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"delete_HtmlHelpController", (PyCFunction) _wrap_delete_HtmlHelpController, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_SetTitleFormat", (PyCFunction) _wrap_HtmlHelpController_SetTitleFormat, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_SetTempDir", (PyCFunction) _wrap_HtmlHelpController_SetTempDir, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_AddBook", (PyCFunction) _wrap_HtmlHelpController_AddBook, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_Display", (PyCFunction) _wrap_HtmlHelpController_Display, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_DisplayID", (PyCFunction) _wrap_HtmlHelpController_DisplayID, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_DisplayContents", (PyCFunction) _wrap_HtmlHelpController_DisplayContents, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_DisplayIndex", (PyCFunction) _wrap_HtmlHelpController_DisplayIndex, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_KeywordSearch", (PyCFunction) _wrap_HtmlHelpController_KeywordSearch, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_UseConfig", (PyCFunction) _wrap_HtmlHelpController_UseConfig, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_ReadCustomization", (PyCFunction) _wrap_HtmlHelpController_ReadCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_WriteCustomization", (PyCFunction) _wrap_HtmlHelpController_WriteCustomization, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_GetFrame", (PyCFunction) _wrap_HtmlHelpController_GetFrame, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"HtmlHelpController_swigregister", HtmlHelpController_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -12007,11 +12138,11 @@ static swig_type_info _swigt__p_wxHtmlWinParser[] = {{"_p_wxHtmlWinParser", 0, "
 static swig_type_info _swigt__p_wxHtmlParser[] = {{"_p_wxHtmlParser", 0, "wxHtmlParser *", 0, 0, 0, 0},{"_p_wxHtmlParser", 0, 0, 0, 0, 0, 0},{"_p_wxHtmlWinParser", _p_wxHtmlWinParserTo_p_wxHtmlParser, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPanel[] = {{"_p_wxPanel", 0, "wxPanel *", 0, 0, 0, 0},{"_p_wxPanel", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxPanel, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxPanel, 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_wxHtmlColourCell[] = {{"_p_wxHtmlColourCell", 0, "wxHtmlColourCell *", 0, 0, 0, 0},{"_p_wxHtmlColourCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxPyHtmlWindow[] = {{"_p_wxPyHtmlWindow", 0, "wxPyHtmlWindow *", 0, 0, 0, 0},{"_p_wxPyHtmlWindow", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxScrolledWindow[] = {{"_p_wxScrolledWindow", 0, "wxScrolledWindow *", 0, 0, 0, 0},{"_p_wxScrolledWindow", 0, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxScrolledWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxScrolledWindow, 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_wxSplashScreen", _p_wxSplashScreenTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxTopLevelWindow[] = {{"_p_wxTopLevelWindow", 0, "wxTopLevelWindow *", 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPrintDialog", _p_wxPrintDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", 0, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxTopLevelWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
+static swig_type_info _swigt__p_wxHtmlColourCell[] = {{"_p_wxHtmlColourCell", 0, "wxHtmlColourCell *", 0, 0, 0, 0},{"_p_wxHtmlColourCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlFontCell[] = {{"_p_wxHtmlFontCell", 0, "wxHtmlFontCell *", 0, 0, 0, 0},{"_p_wxHtmlFontCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlEasyPrinting[] = {{"_p_wxHtmlEasyPrinting", 0, "wxHtmlEasyPrinting *", 0, 0, 0, 0},{"_p_wxHtmlEasyPrinting", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlSelection[] = {{"_p_wxHtmlSelection", 0, "wxHtmlSelection *", 0, 0, 0, 0},{"_p_wxHtmlSelection", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -12042,8 +12173,8 @@ static swig_type_info _swigt__p_wxHtmlFilter[] = {{"_p_wxHtmlFilter", 0, "wxHtml
 static swig_type_info _swigt__p_wxHtmlCell[] = {{"_p_wxHtmlCell", 0, "wxHtmlCell *", 0, 0, 0, 0},{"_p_wxHtmlCell", 0, 0, 0, 0, 0, 0},{"_p_wxHtmlContainerCell", _p_wxHtmlContainerCellTo_p_wxHtmlCell, 0, 0, 0, 0, 0},{"_p_wxHtmlWidgetCell", _p_wxHtmlWidgetCellTo_p_wxHtmlCell, 0, 0, 0, 0, 0},{"_p_wxHtmlColourCell", _p_wxHtmlColourCellTo_p_wxHtmlCell, 0, 0, 0, 0, 0},{"_p_wxHtmlWordCell", _p_wxHtmlWordCellTo_p_wxHtmlCell, 0, 0, 0, 0, 0},{"_p_wxHtmlFontCell", _p_wxHtmlFontCellTo_p_wxHtmlCell, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlContainerCell[] = {{"_p_wxHtmlContainerCell", 0, "wxHtmlContainerCell *", 0, 0, 0, 0},{"_p_wxHtmlContainerCell", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlTag[] = {{"_p_wxHtmlTag", 0, "wxHtmlTag *", 0, 0, 0, 0},{"_p_wxHtmlTag", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
-static swig_type_info _swigt__p_wxHtmlLinkInfo[] = {{"_p_wxHtmlLinkInfo", 0, "wxHtmlLinkInfo *", 0, 0, 0, 0},{"_p_wxHtmlLinkInfo", 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_wxHtmlLinkInfo[] = {{"_p_wxHtmlLinkInfo", 0, "wxHtmlLinkInfo *", 0, 0, 0, 0},{"_p_wxHtmlLinkInfo", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 static swig_type_info _swigt__p_wxHtmlBookRecord[] = {{"_p_wxHtmlBookRecord", 0, "wxHtmlBookRecord *", 0, 0, 0, 0},{"_p_wxHtmlBookRecord", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
 
 static swig_type_info *swig_types_initial[] = {
@@ -12062,11 +12193,11 @@ _swigt__p_wxHtmlWinParser,
 _swigt__p_wxHtmlParser, 
 _swigt__p_wxPanel, 
 _swigt__p_wxFont, 
-_swigt__p_wxHtmlColourCell, 
 _swigt__p_wxPyHtmlWindow, 
 _swigt__p_wxScrolledWindow, 
 _swigt__p_wxWindow, 
 _swigt__p_wxTopLevelWindow, 
+_swigt__p_wxHtmlColourCell, 
 _swigt__p_wxHtmlFontCell, 
 _swigt__p_wxHtmlEasyPrinting, 
 _swigt__p_wxHtmlSelection, 
@@ -12097,8 +12228,8 @@ _swigt__p_wxHtmlFilter,
 _swigt__p_wxHtmlCell, 
 _swigt__p_wxHtmlContainerCell, 
 _swigt__p_wxHtmlTag, 
-_swigt__p_wxHtmlLinkInfo, 
 _swigt__p_int, 
+_swigt__p_wxHtmlLinkInfo, 
 _swigt__p_wxHtmlBookRecord, 
 0
 };
@@ -12107,7 +12238,7 @@ _swigt__p_wxHtmlBookRecord,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -12137,60 +12268,60 @@ SWIGEXPORT(void) SWIG_init(void) {
     SWIG_addvarlink(SWIG_globals,(char*)"HtmlWindowNameStr",_wrap_HtmlWindowNameStr_get, _wrap_HtmlWindowNameStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintoutTitleStr",_wrap_HtmlPrintoutTitleStr_get, _wrap_HtmlPrintoutTitleStr_set);
     SWIG_addvarlink(SWIG_globals,(char*)"HtmlPrintingTitleStr",_wrap_HtmlPrintingTitleStr_get, _wrap_HtmlPrintingTitleStr_set);
-    PyDict_SetItemString(d,"HTML_ALIGN_LEFT", SWIG_FromInt((int)wxHTML_ALIGN_LEFT));
-    PyDict_SetItemString(d,"HTML_ALIGN_CENTER", SWIG_FromInt((int)wxHTML_ALIGN_CENTER));
-    PyDict_SetItemString(d,"HTML_ALIGN_RIGHT", SWIG_FromInt((int)wxHTML_ALIGN_RIGHT));
-    PyDict_SetItemString(d,"HTML_ALIGN_BOTTOM", SWIG_FromInt((int)wxHTML_ALIGN_BOTTOM));
-    PyDict_SetItemString(d,"HTML_ALIGN_TOP", SWIG_FromInt((int)wxHTML_ALIGN_TOP));
-    PyDict_SetItemString(d,"HTML_CLR_FOREGROUND", SWIG_FromInt((int)wxHTML_CLR_FOREGROUND));
-    PyDict_SetItemString(d,"HTML_CLR_BACKGROUND", SWIG_FromInt((int)wxHTML_CLR_BACKGROUND));
-    PyDict_SetItemString(d,"HTML_UNITS_PIXELS", SWIG_FromInt((int)wxHTML_UNITS_PIXELS));
-    PyDict_SetItemString(d,"HTML_UNITS_PERCENT", SWIG_FromInt((int)wxHTML_UNITS_PERCENT));
-    PyDict_SetItemString(d,"HTML_INDENT_LEFT", SWIG_FromInt((int)wxHTML_INDENT_LEFT));
-    PyDict_SetItemString(d,"HTML_INDENT_RIGHT", SWIG_FromInt((int)wxHTML_INDENT_RIGHT));
-    PyDict_SetItemString(d,"HTML_INDENT_TOP", SWIG_FromInt((int)wxHTML_INDENT_TOP));
-    PyDict_SetItemString(d,"HTML_INDENT_BOTTOM", SWIG_FromInt((int)wxHTML_INDENT_BOTTOM));
-    PyDict_SetItemString(d,"HTML_INDENT_HORIZONTAL", SWIG_FromInt((int)wxHTML_INDENT_HORIZONTAL));
-    PyDict_SetItemString(d,"HTML_INDENT_VERTICAL", SWIG_FromInt((int)wxHTML_INDENT_VERTICAL));
-    PyDict_SetItemString(d,"HTML_INDENT_ALL", SWIG_FromInt((int)wxHTML_INDENT_ALL));
-    PyDict_SetItemString(d,"HTML_COND_ISANCHOR", SWIG_FromInt((int)wxHTML_COND_ISANCHOR));
-    PyDict_SetItemString(d,"HTML_COND_ISIMAGEMAP", SWIG_FromInt((int)wxHTML_COND_ISIMAGEMAP));
-    PyDict_SetItemString(d,"HTML_COND_USER", SWIG_FromInt((int)wxHTML_COND_USER));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_1", SWIG_FromInt((int)wxHTML_FONT_SIZE_1));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_2", SWIG_FromInt((int)wxHTML_FONT_SIZE_2));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_3", SWIG_FromInt((int)wxHTML_FONT_SIZE_3));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_4", SWIG_FromInt((int)wxHTML_FONT_SIZE_4));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_5", SWIG_FromInt((int)wxHTML_FONT_SIZE_5));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_6", SWIG_FromInt((int)wxHTML_FONT_SIZE_6));
-    PyDict_SetItemString(d,"HTML_FONT_SIZE_7", SWIG_FromInt((int)wxHTML_FONT_SIZE_7));
-    PyDict_SetItemString(d,"HW_SCROLLBAR_NEVER", SWIG_FromInt((int)wxHW_SCROLLBAR_NEVER));
-    PyDict_SetItemString(d,"HW_SCROLLBAR_AUTO", SWIG_FromInt((int)wxHW_SCROLLBAR_AUTO));
-    PyDict_SetItemString(d,"HW_NO_SELECTION", SWIG_FromInt((int)wxHW_NO_SELECTION));
-    PyDict_SetItemString(d,"HW_DEFAULT_STYLE", SWIG_FromInt((int)wxHW_DEFAULT_STYLE));
-    PyDict_SetItemString(d,"HTML_OPEN", SWIG_FromInt((int)wxHTML_OPEN));
-    PyDict_SetItemString(d,"HTML_BLOCK", SWIG_FromInt((int)wxHTML_BLOCK));
-    PyDict_SetItemString(d,"HTML_REDIRECT", SWIG_FromInt((int)wxHTML_REDIRECT));
-    PyDict_SetItemString(d,"HTML_URL_PAGE", SWIG_FromInt((int)wxHTML_URL_PAGE));
-    PyDict_SetItemString(d,"HTML_URL_IMAGE", SWIG_FromInt((int)wxHTML_URL_IMAGE));
-    PyDict_SetItemString(d,"HTML_URL_OTHER", SWIG_FromInt((int)wxHTML_URL_OTHER));
-    PyDict_SetItemString(d,"HTML_SEL_OUT", SWIG_FromInt((int)wxHTML_SEL_OUT));
-    PyDict_SetItemString(d,"HTML_SEL_IN", SWIG_FromInt((int)wxHTML_SEL_IN));
-    PyDict_SetItemString(d,"HTML_SEL_CHANGING", SWIG_FromInt((int)wxHTML_SEL_CHANGING));
-    PyDict_SetItemString(d,"HTML_FIND_EXACT", SWIG_FromInt((int)wxHTML_FIND_EXACT));
-    PyDict_SetItemString(d,"HTML_FIND_NEAREST_BEFORE", SWIG_FromInt((int)wxHTML_FIND_NEAREST_BEFORE));
-    PyDict_SetItemString(d,"HTML_FIND_NEAREST_AFTER", SWIG_FromInt((int)wxHTML_FIND_NEAREST_AFTER));
-    PyDict_SetItemString(d,"PAGE_ODD", SWIG_FromInt((int)wxPAGE_ODD));
-    PyDict_SetItemString(d,"PAGE_EVEN", SWIG_FromInt((int)wxPAGE_EVEN));
-    PyDict_SetItemString(d,"PAGE_ALL", SWIG_FromInt((int)wxPAGE_ALL));
-    PyDict_SetItemString(d,"HF_TOOLBAR", SWIG_FromInt((int)wxHF_TOOLBAR));
-    PyDict_SetItemString(d,"HF_FLATTOOLBAR", SWIG_FromInt((int)wxHF_FLATTOOLBAR));
-    PyDict_SetItemString(d,"HF_CONTENTS", SWIG_FromInt((int)wxHF_CONTENTS));
-    PyDict_SetItemString(d,"HF_INDEX", SWIG_FromInt((int)wxHF_INDEX));
-    PyDict_SetItemString(d,"HF_SEARCH", SWIG_FromInt((int)wxHF_SEARCH));
-    PyDict_SetItemString(d,"HF_BOOKMARKS", SWIG_FromInt((int)wxHF_BOOKMARKS));
-    PyDict_SetItemString(d,"HF_OPENFILES", SWIG_FromInt((int)wxHF_OPENFILES));
-    PyDict_SetItemString(d,"HF_PRINT", SWIG_FromInt((int)wxHF_PRINT));
-    PyDict_SetItemString(d,"HF_DEFAULTSTYLE", SWIG_FromInt((int)wxHF_DEFAULTSTYLE));
+    PyDict_SetItemString(d,"HTML_ALIGN_LEFT", SWIG_From_int((int)wxHTML_ALIGN_LEFT));
+    PyDict_SetItemString(d,"HTML_ALIGN_CENTER", SWIG_From_int((int)wxHTML_ALIGN_CENTER));
+    PyDict_SetItemString(d,"HTML_ALIGN_RIGHT", SWIG_From_int((int)wxHTML_ALIGN_RIGHT));
+    PyDict_SetItemString(d,"HTML_ALIGN_BOTTOM", SWIG_From_int((int)wxHTML_ALIGN_BOTTOM));
+    PyDict_SetItemString(d,"HTML_ALIGN_TOP", SWIG_From_int((int)wxHTML_ALIGN_TOP));
+    PyDict_SetItemString(d,"HTML_CLR_FOREGROUND", SWIG_From_int((int)wxHTML_CLR_FOREGROUND));
+    PyDict_SetItemString(d,"HTML_CLR_BACKGROUND", SWIG_From_int((int)wxHTML_CLR_BACKGROUND));
+    PyDict_SetItemString(d,"HTML_UNITS_PIXELS", SWIG_From_int((int)wxHTML_UNITS_PIXELS));
+    PyDict_SetItemString(d,"HTML_UNITS_PERCENT", SWIG_From_int((int)wxHTML_UNITS_PERCENT));
+    PyDict_SetItemString(d,"HTML_INDENT_LEFT", SWIG_From_int((int)wxHTML_INDENT_LEFT));
+    PyDict_SetItemString(d,"HTML_INDENT_RIGHT", SWIG_From_int((int)wxHTML_INDENT_RIGHT));
+    PyDict_SetItemString(d,"HTML_INDENT_TOP", SWIG_From_int((int)wxHTML_INDENT_TOP));
+    PyDict_SetItemString(d,"HTML_INDENT_BOTTOM", SWIG_From_int((int)wxHTML_INDENT_BOTTOM));
+    PyDict_SetItemString(d,"HTML_INDENT_HORIZONTAL", SWIG_From_int((int)wxHTML_INDENT_HORIZONTAL));
+    PyDict_SetItemString(d,"HTML_INDENT_VERTICAL", SWIG_From_int((int)wxHTML_INDENT_VERTICAL));
+    PyDict_SetItemString(d,"HTML_INDENT_ALL", SWIG_From_int((int)wxHTML_INDENT_ALL));
+    PyDict_SetItemString(d,"HTML_COND_ISANCHOR", SWIG_From_int((int)wxHTML_COND_ISANCHOR));
+    PyDict_SetItemString(d,"HTML_COND_ISIMAGEMAP", SWIG_From_int((int)wxHTML_COND_ISIMAGEMAP));
+    PyDict_SetItemString(d,"HTML_COND_USER", SWIG_From_int((int)wxHTML_COND_USER));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_1", SWIG_From_int((int)wxHTML_FONT_SIZE_1));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_2", SWIG_From_int((int)wxHTML_FONT_SIZE_2));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_3", SWIG_From_int((int)wxHTML_FONT_SIZE_3));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_4", SWIG_From_int((int)wxHTML_FONT_SIZE_4));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_5", SWIG_From_int((int)wxHTML_FONT_SIZE_5));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_6", SWIG_From_int((int)wxHTML_FONT_SIZE_6));
+    PyDict_SetItemString(d,"HTML_FONT_SIZE_7", SWIG_From_int((int)wxHTML_FONT_SIZE_7));
+    PyDict_SetItemString(d,"HW_SCROLLBAR_NEVER", SWIG_From_int((int)wxHW_SCROLLBAR_NEVER));
+    PyDict_SetItemString(d,"HW_SCROLLBAR_AUTO", SWIG_From_int((int)wxHW_SCROLLBAR_AUTO));
+    PyDict_SetItemString(d,"HW_NO_SELECTION", SWIG_From_int((int)wxHW_NO_SELECTION));
+    PyDict_SetItemString(d,"HW_DEFAULT_STYLE", SWIG_From_int((int)wxHW_DEFAULT_STYLE));
+    PyDict_SetItemString(d,"HTML_OPEN", SWIG_From_int((int)wxHTML_OPEN));
+    PyDict_SetItemString(d,"HTML_BLOCK", SWIG_From_int((int)wxHTML_BLOCK));
+    PyDict_SetItemString(d,"HTML_REDIRECT", SWIG_From_int((int)wxHTML_REDIRECT));
+    PyDict_SetItemString(d,"HTML_URL_PAGE", SWIG_From_int((int)wxHTML_URL_PAGE));
+    PyDict_SetItemString(d,"HTML_URL_IMAGE", SWIG_From_int((int)wxHTML_URL_IMAGE));
+    PyDict_SetItemString(d,"HTML_URL_OTHER", SWIG_From_int((int)wxHTML_URL_OTHER));
+    PyDict_SetItemString(d,"HTML_SEL_OUT", SWIG_From_int((int)wxHTML_SEL_OUT));
+    PyDict_SetItemString(d,"HTML_SEL_IN", SWIG_From_int((int)wxHTML_SEL_IN));
+    PyDict_SetItemString(d,"HTML_SEL_CHANGING", SWIG_From_int((int)wxHTML_SEL_CHANGING));
+    PyDict_SetItemString(d,"HTML_FIND_EXACT", SWIG_From_int((int)wxHTML_FIND_EXACT));
+    PyDict_SetItemString(d,"HTML_FIND_NEAREST_BEFORE", SWIG_From_int((int)wxHTML_FIND_NEAREST_BEFORE));
+    PyDict_SetItemString(d,"HTML_FIND_NEAREST_AFTER", SWIG_From_int((int)wxHTML_FIND_NEAREST_AFTER));
+    PyDict_SetItemString(d,"PAGE_ODD", SWIG_From_int((int)wxPAGE_ODD));
+    PyDict_SetItemString(d,"PAGE_EVEN", SWIG_From_int((int)wxPAGE_EVEN));
+    PyDict_SetItemString(d,"PAGE_ALL", SWIG_From_int((int)wxPAGE_ALL));
+    PyDict_SetItemString(d,"HF_TOOLBAR", SWIG_From_int((int)wxHF_TOOLBAR));
+    PyDict_SetItemString(d,"HF_FLATTOOLBAR", SWIG_From_int((int)wxHF_FLATTOOLBAR));
+    PyDict_SetItemString(d,"HF_CONTENTS", SWIG_From_int((int)wxHF_CONTENTS));
+    PyDict_SetItemString(d,"HF_INDEX", SWIG_From_int((int)wxHF_INDEX));
+    PyDict_SetItemString(d,"HF_SEARCH", SWIG_From_int((int)wxHF_SEARCH));
+    PyDict_SetItemString(d,"HF_BOOKMARKS", SWIG_From_int((int)wxHF_BOOKMARKS));
+    PyDict_SetItemString(d,"HF_OPENFILES", SWIG_From_int((int)wxHF_OPENFILES));
+    PyDict_SetItemString(d,"HF_PRINT", SWIG_From_int((int)wxHF_PRINT));
+    PyDict_SetItemString(d,"HF_DEFAULTSTYLE", SWIG_From_int((int)wxHF_DEFAULTSTYLE));
     
     wxPyPtrTypeMap_Add("wxHtmlTagHandler",    "wxPyHtmlTagHandler");
     wxPyPtrTypeMap_Add("wxHtmlWinTagHandler", "wxPyHtmlWinTagHandler");

diff --git a/wxPython/src/mac/wizard_wrap.cpp b/wxPython/src/mac/wizard_wrap.cpp
index cf2412b5339d3c1bc8de74b4e85b61df21280e71..ff100654b3fd00d65da636b943b4d1f9a72e1fcc 100644 (file)
--- a/wxPython/src/mac/wizard_wrap.cpp
+++ b/wxPython/src/mac/wizard_wrap.cpp
@@ -43,6 +43,7 @@ private:
 #define SWIG_TypeCast        SWIG_Python_TypeCast
 #define SWIG_TypeDynamicCast SWIG_Python_TypeDynamicCast
 #define SWIG_TypeName        SWIG_Python_TypeName
+#define SWIG_TypePrettyName  SWIG_Python_TypePrettyName
 #define SWIG_TypeQuery       SWIG_Python_TypeQuery
 #define SWIG_TypeClientData  SWIG_Python_TypeClientData
 #define SWIG_PackData        SWIG_Python_PackData 
@@ -113,6 +114,7 @@ SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
 SWIGIMPORT(void *)           SWIG_TypeCast(swig_type_info *, void *);
 SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
 SWIGIMPORT(const char *)     SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(const char *)     SWIG_TypePrettyName(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);
@@ -123,6 +125,7 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
 }
 #endif
 
+
 /***********************************************************************
  * pyrun.swg for wxPython
  *
@@ -133,8 +136,6 @@ SWIGIMPORT(char *)           SWIG_UnpackData(char *, void *, int);
  *
  ************************************************************************/
 
-#include "Python.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -204,6 +205,7 @@ SWIGIMPORT(void)              SWIG_Python_InstallConstants(PyObject *d, swig_con
 #endif
 
 
+
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define  SWIGTYPE_p_wxObject swig_types[0] 
@@ -238,47 +240,64 @@ static swig_type_info *swig_types[21];
 
 #define SWIG_name    "_wizard"
 
-/* Auxiliar swig  macros */
+/* Auxiliar swig  macros that appear in the header */
+
+#define SWIG_OLDOBJ  1
+#define SWIG_NEWOBJ  SWIG_OLDOBJ + 1
+#define SWIG_PYSTR   SWIG_NEWOBJ + 1
 
 #ifdef __cplusplus
 #define SWIGSTATICINLINE(a) static inline a
 #define SWIGSTATIC(a) static a
-#define swig_new_array(type, size) (new type[(size)])
+#define swig_new_array(size,Type) (new Type[(size)])
+#define swig_delete(cptr) delete cptr
 #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
+#define swig_const_cast(a,Type) const_cast<Type >(a)
+#define swig_static_cast(a,Type) static_cast<Type >(a)
+#define swig_reinterpret_cast(a,Type) reinterpret_cast<Type >(a)
+#define swig_new_copy(ptr,Type) (new Type(*ptr))
+#define swig_numeric_cast(a,Type) static_cast<Type >(a)
 
 #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_new_array(size,Type) ((Type*) malloc((size)*sizeof(Type)))
+#define swig_delete(cptr) free((char*)cptr)
 #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)
+#define swig_const_cast(a,Type) (Type)(a)
+#define swig_static_cast(a,Type) (Type)(a)
+#define swig_reinterpret_cast(a,Type) (Type)(a)
+#define swig_numeric_cast(a,Type) (Type)(a)
+#define swig_new_copy(ptr,Type)  ((Type*)memcpy(malloc(sizeof(Type)),ptr,sizeof(Type)))
 
 #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
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_signed_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_char PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_unsigned_SS_short PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_int PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_long PyInt_FromLong
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_float PyFloat_FromDouble
+/*@@*/
+/*@/opt/swig/share/swig/1.3.22/python/pymacros.swg,63,SWIG_define@*/
+#define SWIG_From_double PyFloat_FromDouble
+/*@@*/
 
 
 #include "wx/wxPython/wxPython.h"
@@ -293,88 +312,144 @@ static swig_type_info *swig_types[21];
 #include <limits.h>
 
 
-SWIGSTATICINLINE(long)
-SWIG_CheckLongInRange(long value, const char* type,
-                     long min_value, long max_value)
+SWIGSTATICINLINE(int)
+  SWIG_CheckLongInRange(long value, long min_value, long max_value,
+                       const char *errmsg)
 {
-  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);
+  if (value < min_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError, 
+                  "value %ld is less than '%s' minimum %ld", 
+                  value, errmsg, min_value);
+    }
+    return 0;    
+  } else if (value > max_value) {
+    if (errmsg) {
+      PyErr_Format(PyExc_OverflowError,
+                  "value %ld is greater than '%s' maximum %ld", 
+                  value, errmsg, max_value);
     }
+    return 0;
   }
-  return value;
+  return 1;
 }
 
 
-SWIGSTATICINLINE(long)
-SWIG_AsLong(PyObject * obj)
+// See my_fragments.i
+SWIGSTATICINLINE(int)
+SWIG_AsVal_long(PyObject* obj, long* val)
 {
-    if (PyNumber_Check(obj))
-        return PyInt_AsLong(obj);
+    if (PyNumber_Check(obj)) {
+        if (val) *val = PyInt_AsLong(obj);
+        return 1;
+    }
     else {
         PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
                                                obj->ob_type->tp_name);
         PyErr_SetObject(PyExc_TypeError, errmsg);
         Py_DECREF(errmsg);
-        return 0;
     }
+    return 0;
 }
 
 
 #if INT_MAX != LONG_MAX
 SWIGSTATICINLINE(int)
-SWIG_AsInt(PyObject *obj)
+  SWIG_AsVal_int(PyObject *obj, int *val)
 { 
-  return swig_numeric_cast(int,
-    SWIG_CheckLongInRange(SWIG_AsLong(obj),
-                         "int", INT_MIN, INT_MAX));
+  const char* errmsg = val ? "int" : 0;
+  long v;
+  if (SWIG_AsVal_long(obj, &v)) {
+    if (SWIG_CheckLongInRange(v, INT_MIN,INT_MAX, errmsg)) {
+      if (val) *val = swig_numeric_cast(v, int);
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    PyErr_Clear();
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "an int is expected");
+  }
+  return 0;    
 }
 #else
-#define SWIG_AsInt SWIG_AsLong
+SWIGSTATICINLINE(int)
+  SWIG_AsVal_int(PyObject *obj, int *val)
+{
+  return SWIG_AsVal_long(obj,(long*)val);
+}
 #endif
 
 
-SWIGSTATICINLINE(bool)
-SWIG_AsBool(PyObject *obj)
+SWIGSTATICINLINE(int)
+SWIG_As_int(PyObject* obj)
 {
-  return PyObject_IsTrue(obj) ? true : false;
+  int v;
+  if (!SWIG_AsVal_int(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(int));
+  }
+  return v;
 }
 
 
 SWIGSTATICINLINE(int)
-SWIG_CheckInt(PyObject* obj)
+  SWIG_AsVal_bool(PyObject *obj, bool *val)
 {
-  SWIG_AsInt(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
+  /*  if (val) *val = PyObject_IsTrue(obj); return 1; */
+  if (obj == Py_True) {
+    if (val) *val = true;
     return 1;
   }
+  if (obj == Py_False) {
+    if (val) *val = false;
+    return 1;
+  }
+  int res = 0;
+  if (SWIG_AsVal_int(obj, &res)) {    
+    if (val) *val = (bool)res;
+    return 1;
+  }
+  if (val) {
+    PyErr_SetString(PyExc_TypeError, "a bool is expected");
+  }
+  return 0;
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckBool(PyObject* obj)
+SWIGSTATICINLINE(bool)
+SWIG_As_bool(PyObject* obj)
 {
-  SWIG_AsBool(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  bool v;
+  if (!SWIG_AsVal_bool(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(bool));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_int(PyObject* obj)
+{
+  return SWIG_AsVal_int(obj, (int*)0);
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_bool(PyObject* obj)
+{
+  return SWIG_AsVal_bool(obj, (bool*)0);
 }
 
 bool wxWizardPage_Create(wxWizardPage *self,wxWizard *parent,wxBitmap const &bitmap,wxString const &resource){
@@ -469,21 +544,20 @@ bool wxPyWizardPage_Create(wxPyWizardPage *self,wxWizard *parent,wxBitmap const
             return self->Create(parent, bitmap, res);
         }
 
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
+  static PyObject* t_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
     PyObject*   o3;
-
+    
     if (!target) {                   
         target = o;
     } else if (target == Py_None) {  
         Py_DECREF(Py_None);
         target = o;
     } else {                         
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
+        o2 = target;
+        target = PyTuple_New(1);
+        PyTuple_SetItem(target, 0, o2);
+
         o3 = PyTuple_New(1);            
         PyTuple_SetItem(o3, 0, o);      
 
@@ -496,22 +570,33 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
 }
 
 
-SWIGSTATICINLINE(int)
-SWIG_CheckLong(PyObject* obj)
+
+SWIGSTATICINLINE(long)
+SWIG_As_long(PyObject* obj)
 {
-  SWIG_AsLong(obj);
-  if (PyErr_Occurred()) {
-    PyErr_Clear();
-    return 0;
-  } else {
-    return 1;
+  long v;
+  if (!SWIG_AsVal_long(obj, &v)) {
+    /*
+      this is needed to make valgrind/purify happier.  the other
+      solution is throw an exception, but since this code should work
+      with plain C ....
+     */
+    memset((void*)&v, 0, sizeof(long));
   }
+  return v;
+}
+
+  
+SWIGSTATICINLINE(int)
+SWIG_Check_long(PyObject* obj)
+{
+  return SWIG_AsVal_long(obj, (long*)0);
 }
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_new_WizardEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WizardEvent(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxEventType arg1 = (wxEventType) wxEVT_NULL ;
     int arg2 = (int) -1 ;
@@ -528,15 +613,15 @@ static PyObject *_wrap_new_WizardEvent(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_WizardEvent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
     if (obj0) {
-        arg1 = (wxEventType) SWIG_AsInt(obj0); 
+        arg1 = (wxEventType)SWIG_As_int(obj0); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -557,7 +642,7 @@ static PyObject *_wrap_new_WizardEvent(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_WizardEvent_GetDirection(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardEvent_GetDirection(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardEvent *arg1 = (wxWizardEvent *) 0 ;
     bool result;
@@ -585,7 +670,7 @@ static PyObject *_wrap_WizardEvent_GetDirection(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_WizardEvent_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardEvent_GetPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardEvent *arg1 = (wxWizardEvent *) 0 ;
     wxWizardPage *result;
@@ -613,14 +698,14 @@ static PyObject *_wrap_WizardEvent_GetPage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject * WizardEvent_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WizardEvent_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWizardEvent, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPage_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPage *arg1 = (wxWizardPage *) 0 ;
     wxWizard *arg2 = (wxWizard *) 0 ;
@@ -683,7 +768,7 @@ static PyObject *_wrap_WizardPage_Create(PyObject *self, PyObject *args, PyObjec
 }
 
 
-static PyObject *_wrap_WizardPage_GetPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPage_GetPrev(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPage *arg1 = (wxWizardPage *) 0 ;
     wxWizardPage *result;
@@ -711,7 +796,7 @@ static PyObject *_wrap_WizardPage_GetPrev(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_WizardPage_GetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPage_GetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPage *arg1 = (wxWizardPage *) 0 ;
     wxWizardPage *result;
@@ -739,7 +824,7 @@ static PyObject *_wrap_WizardPage_GetNext(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_WizardPage_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPage_GetBitmap(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPage *arg1 = (wxWizardPage *) 0 ;
     wxBitmap result;
@@ -769,14 +854,14 @@ static PyObject *_wrap_WizardPage_GetBitmap(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject * WizardPage_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WizardPage_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWizardPage, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_PyWizardPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PyWizardPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxBitmap *arg2 = (wxBitmap *) &wxNullBitmap ;
@@ -827,7 +912,7 @@ static PyObject *_wrap_new_PyWizardPage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_new_PrePyWizardPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PrePyWizardPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *result;
     char *kwnames[] = {
@@ -850,7 +935,7 @@ static PyObject *_wrap_new_PrePyWizardPage(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     wxWizard *arg2 = (wxWizard *) 0 ;
@@ -913,7 +998,7 @@ static PyObject *_wrap_PyWizardPage_Create(PyObject *self, PyObject *args, PyObj
 }
 
 
-static PyObject *_wrap_PyWizardPage__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage__setCallbackInfo(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     PyObject *arg2 = (PyObject *) 0 ;
@@ -944,7 +1029,7 @@ static PyObject *_wrap_PyWizardPage__setCallbackInfo(PyObject *self, PyObject *a
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int arg2 ;
@@ -963,13 +1048,13 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *self, PyObject *
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:PyWizardPage_base_DoMoveWindow",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -985,7 +1070,7 @@ static PyObject *_wrap_PyWizardPage_base_DoMoveWindow(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int arg2 ;
@@ -1006,16 +1091,16 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *self, PyObject *arg
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:PyWizardPage_base_DoSetSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg4 = (int) SWIG_AsInt(obj3); 
+    arg4 = (int)SWIG_As_int(obj3); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg5 = (int) SWIG_AsInt(obj4); 
+    arg5 = (int)SWIG_As_int(obj4); 
     if (PyErr_Occurred()) SWIG_fail;
     if (obj5) {
-        arg6 = (int) SWIG_AsInt(obj5); 
+        arg6 = (int)SWIG_As_int(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1032,7 +1117,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetSize(PyObject *self, PyObject *arg
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int arg2 ;
@@ -1047,9 +1132,9 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *self, PyObjec
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetClientSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1065,7 +1150,7 @@ static PyObject *_wrap_PyWizardPage_base_DoSetClientSize(PyObject *self, PyObjec
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int arg2 ;
@@ -1080,9 +1165,9 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *self, PyObje
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyWizardPage_base_DoSetVirtualSize",kwnames,&obj0,&obj1,&obj2)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
-    arg3 = (int) SWIG_AsInt(obj2); 
+    arg3 = (int)SWIG_As_int(obj2); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -1098,20 +1183,22 @@ static PyObject *_wrap_PyWizardPage_base_DoSetVirtualSize(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoGetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoGetSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1123,34 +1210,32 @@ static PyObject *_wrap_PyWizardPage_base_DoGetSize(PyObject *self, PyObject *arg
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoGetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoGetClientSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetClientSize",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1162,34 +1247,32 @@ static PyObject *_wrap_PyWizardPage_base_DoGetClientSize(PyObject *self, PyObjec
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoGetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoGetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     int *arg2 = (int *) 0 ;
     int *arg3 = (int *) 0 ;
     int temp2 ;
+    int res2 = 0 ;
     int temp3 ;
+    int res3 = 0 ;
     PyObject * obj0 = 0 ;
     char *kwnames[] = {
         (char *) "self", NULL 
     };
     
-    arg2 = &temp2;
-    arg3 = &temp3;
+    arg2 = &temp2; res2 = SWIG_NEWOBJ;
+    arg3 = &temp3; res3 = SWIG_NEWOBJ;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyWizardPage_base_DoGetPosition",kwnames,&obj0)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
@@ -1201,21 +1284,17 @@ static PyObject *_wrap_PyWizardPage_base_DoGetPosition(PyObject *self, PyObject
         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);
-    }
+    resultobj = t_output_helper(resultobj, ((res2 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg2)) : SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, 0)));
+    resultobj = t_output_helper(resultobj, ((res3 == SWIG_NEWOBJ) ?
+    SWIG_From_int((*arg3)) : SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_int, 0)));
     return resultobj;
     fail:
     return NULL;
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoGetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoGetVirtualSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     wxSize result;
@@ -1245,7 +1324,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetVirtualSize(PyObject *self, PyObje
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_DoGetBestSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_DoGetBestSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     wxSize result;
@@ -1275,7 +1354,7 @@ static PyObject *_wrap_PyWizardPage_base_DoGetBestSize(PyObject *self, PyObject
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_InitDialog(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1300,7 +1379,7 @@ static PyObject *_wrap_PyWizardPage_base_InitDialog(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     bool result;
@@ -1328,7 +1407,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataToWindow(PyObject *self, Py
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     bool result;
@@ -1356,7 +1435,7 @@ static PyObject *_wrap_PyWizardPage_base_TransferDataFromWindow(PyObject *self,
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     bool result;
@@ -1384,7 +1463,7 @@ static PyObject *_wrap_PyWizardPage_base_Validate(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     bool result;
@@ -1412,7 +1491,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocus(PyObject *self, PyObject *
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     bool result;
@@ -1440,7 +1519,7 @@ static PyObject *_wrap_PyWizardPage_base_AcceptsFocusFromKeyboard(PyObject *self
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_GetMaxSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     wxSize result;
@@ -1470,7 +1549,7 @@ static PyObject *_wrap_PyWizardPage_base_GetMaxSize(PyObject *self, PyObject *ar
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_AddChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_AddChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1499,7 +1578,7 @@ static PyObject *_wrap_PyWizardPage_base_AddChild(PyObject *self, PyObject *args
 }
 
 
-static PyObject *_wrap_PyWizardPage_base_RemoveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_PyWizardPage_base_RemoveChild(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxPyWizardPage *arg1 = (wxPyWizardPage *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1528,14 +1607,14 @@ static PyObject *_wrap_PyWizardPage_base_RemoveChild(PyObject *self, PyObject *a
 }
 
 
-static PyObject * PyWizardPage_swigregister(PyObject *self, PyObject *args) {
+static PyObject * PyWizardPage_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxPyWizardPage, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_WizardPageSimple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_WizardPageSimple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) NULL ;
@@ -1592,7 +1671,7 @@ static PyObject *_wrap_new_WizardPageSimple(PyObject *self, PyObject *args, PyOb
 }
 
 
-static PyObject *_wrap_new_PreWizardPageSimple(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreWizardPageSimple(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPageSimple *result;
     char *kwnames[] = {
@@ -1615,7 +1694,7 @@ static PyObject *_wrap_new_PreWizardPageSimple(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_WizardPageSimple_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPageSimple_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPageSimple *arg1 = (wxWizardPageSimple *) 0 ;
     wxWizard *arg2 = (wxWizard *) NULL ;
@@ -1679,7 +1758,7 @@ static PyObject *_wrap_WizardPageSimple_Create(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_WizardPageSimple_SetPrev(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPageSimple_SetPrev(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPageSimple *arg1 = (wxWizardPageSimple *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -1708,7 +1787,7 @@ static PyObject *_wrap_WizardPageSimple_SetPrev(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_WizardPageSimple_SetNext(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPageSimple_SetNext(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPageSimple *arg1 = (wxWizardPageSimple *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -1737,7 +1816,7 @@ static PyObject *_wrap_WizardPageSimple_SetNext(PyObject *self, PyObject *args,
 }
 
 
-static PyObject *_wrap_WizardPageSimple_Chain(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_WizardPageSimple_Chain(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizardPageSimple *arg1 = (wxWizardPageSimple *) 0 ;
     wxWizardPageSimple *arg2 = (wxWizardPageSimple *) 0 ;
@@ -1766,14 +1845,14 @@ static PyObject *_wrap_WizardPageSimple_Chain(PyObject *self, PyObject *args, Py
 }
 
 
-static PyObject * WizardPageSimple_swigregister(PyObject *self, PyObject *args) {
+static PyObject * WizardPageSimple_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWizardPageSimple, obj);
     Py_INCREF(obj);
     return Py_BuildValue((char *)"");
 }
-static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_Wizard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWindow *arg1 = (wxWindow *) 0 ;
     int arg2 = (int) -1 ;
@@ -1801,7 +1880,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj1) {
-        arg2 = (int) SWIG_AsInt(obj1); 
+        arg2 = (int)SWIG_As_int(obj1); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj2) {
@@ -1827,7 +1906,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
         }
     }
     if (obj5) {
-        arg6 = (long) SWIG_AsLong(obj5); 
+        arg6 = (long)SWIG_As_long(obj5); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -1853,7 +1932,7 @@ static PyObject *_wrap_new_Wizard(PyObject *self, PyObject *args, PyObject *kwar
 }
 
 
-static PyObject *_wrap_new_PreWizard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_new_PreWizard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *result;
     char *kwnames[] = {
@@ -1876,7 +1955,7 @@ static PyObject *_wrap_new_PreWizard(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_Create(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWindow *arg2 = (wxWindow *) 0 ;
@@ -1906,7 +1985,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (int) SWIG_AsInt(obj2); 
+        arg3 = (int)SWIG_As_int(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     if (obj3) {
@@ -1955,7 +2034,7 @@ static PyObject *_wrap_Wizard_Create(PyObject *self, PyObject *args, PyObject *k
 }
 
 
-static PyObject *_wrap_Wizard_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_Init(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     PyObject * obj0 = 0 ;
@@ -1980,7 +2059,7 @@ static PyObject *_wrap_Wizard_Init(PyObject *self, PyObject *args, PyObject *kwa
 }
 
 
-static PyObject *_wrap_Wizard_RunWizard(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_RunWizard(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -2012,7 +2091,7 @@ static PyObject *_wrap_Wizard_RunWizard(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Wizard_GetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_GetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *result;
@@ -2040,7 +2119,7 @@ static PyObject *_wrap_Wizard_GetCurrentPage(PyObject *self, PyObject *args, PyO
 }
 
 
-static PyObject *_wrap_Wizard_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_SetPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxSize *arg2 = 0 ;
@@ -2072,7 +2151,7 @@ static PyObject *_wrap_Wizard_SetPageSize(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Wizard_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_GetPageSize(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxSize result;
@@ -2102,7 +2181,7 @@ static PyObject *_wrap_Wizard_GetPageSize(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Wizard_FitToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_FitToPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -2131,7 +2210,7 @@ static PyObject *_wrap_Wizard_FitToPage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Wizard_GetPageAreaSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_GetPageAreaSizer(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxSizer *result;
@@ -2159,7 +2238,7 @@ static PyObject *_wrap_Wizard_GetPageAreaSizer(PyObject *self, PyObject *args, P
 }
 
 
-static PyObject *_wrap_Wizard_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_SetBorder(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     int arg2 ;
@@ -2172,7 +2251,7 @@ static PyObject *_wrap_Wizard_SetBorder(PyObject *self, PyObject *args, PyObject
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Wizard_SetBorder",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWizard,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
-    arg2 = (int) SWIG_AsInt(obj1); 
+    arg2 = (int)SWIG_As_int(obj1); 
     if (PyErr_Occurred()) SWIG_fail;
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
@@ -2188,7 +2267,7 @@ static PyObject *_wrap_Wizard_SetBorder(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Wizard_IsRunning(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_IsRunning(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     bool result;
@@ -2216,7 +2295,7 @@ static PyObject *_wrap_Wizard_IsRunning(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_ShowPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -2235,7 +2314,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject
     if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWizardPage,
     SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
     if (obj2) {
-        arg3 = (bool) SWIG_AsBool(obj2); 
+        arg3 = (bool)SWIG_As_bool(obj2); 
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
@@ -2254,7 +2333,7 @@ static PyObject *_wrap_Wizard_ShowPage(PyObject *self, PyObject *args, PyObject
 }
 
 
-static PyObject *_wrap_Wizard_HasNextPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_HasNextPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -2286,7 +2365,7 @@ static PyObject *_wrap_Wizard_HasNextPage(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject *_wrap_Wizard_HasPrevPage(PyObject *self, PyObject *args, PyObject *kwargs) {
+static PyObject *_wrap_Wizard_HasPrevPage(PyObject *, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxWizard *arg1 = (wxWizard *) 0 ;
     wxWizardPage *arg2 = (wxWizardPage *) 0 ;
@@ -2318,7 +2397,7 @@ static PyObject *_wrap_Wizard_HasPrevPage(PyObject *self, PyObject *args, PyObje
 }
 
 
-static PyObject * Wizard_swigregister(PyObject *self, PyObject *args) {
+static PyObject * Wizard_swigregister(PyObject *, PyObject *args) {
     PyObject *obj;
     if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
     SWIG_TypeClientData(SWIGTYPE_p_wxWizard, obj);
@@ -2326,62 +2405,62 @@ static PyObject * Wizard_swigregister(PyObject *self, PyObject *args) {
     return Py_BuildValue((char *)"");
 }
 static PyMethodDef SwigMethods[] = {
-        { (char *)"new_WizardEvent", (PyCFunction) _wrap_new_WizardEvent, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardEvent_GetDirection", (PyCFunction) _wrap_WizardEvent_GetDirection, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardEvent_GetPage", (PyCFunction) _wrap_WizardEvent_GetPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardEvent_swigregister", WizardEvent_swigregister, METH_VARARGS },
-        { (char *)"WizardPage_Create", (PyCFunction) _wrap_WizardPage_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPage_GetPrev", (PyCFunction) _wrap_WizardPage_GetPrev, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPage_GetNext", (PyCFunction) _wrap_WizardPage_GetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPage_GetBitmap", (PyCFunction) _wrap_WizardPage_GetBitmap, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPage_swigregister", WizardPage_swigregister, METH_VARARGS },
-        { (char *)"new_PyWizardPage", (PyCFunction) _wrap_new_PyWizardPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PrePyWizardPage", (PyCFunction) _wrap_new_PrePyWizardPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_Create", (PyCFunction) _wrap_PyWizardPage_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage__setCallbackInfo", (PyCFunction) _wrap_PyWizardPage__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoMoveWindow", (PyCFunction) _wrap_PyWizardPage_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoSetSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoSetClientSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoGetSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoGetClientSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoGetPosition", (PyCFunction) _wrap_PyWizardPage_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_DoGetBestSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_InitDialog", (PyCFunction) _wrap_PyWizardPage_base_InitDialog, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_TransferDataToWindow", (PyCFunction) _wrap_PyWizardPage_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWizardPage_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_Validate", (PyCFunction) _wrap_PyWizardPage_base_Validate, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_AcceptsFocus", (PyCFunction) _wrap_PyWizardPage_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWizardPage_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_GetMaxSize", (PyCFunction) _wrap_PyWizardPage_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_AddChild", (PyCFunction) _wrap_PyWizardPage_base_AddChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_base_RemoveChild", (PyCFunction) _wrap_PyWizardPage_base_RemoveChild, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"PyWizardPage_swigregister", PyWizardPage_swigregister, METH_VARARGS },
-        { (char *)"new_WizardPageSimple", (PyCFunction) _wrap_new_WizardPageSimple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreWizardPageSimple", (PyCFunction) _wrap_new_PreWizardPageSimple, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPageSimple_Create", (PyCFunction) _wrap_WizardPageSimple_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPageSimple_SetPrev", (PyCFunction) _wrap_WizardPageSimple_SetPrev, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPageSimple_SetNext", (PyCFunction) _wrap_WizardPageSimple_SetNext, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPageSimple_Chain", (PyCFunction) _wrap_WizardPageSimple_Chain, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"WizardPageSimple_swigregister", WizardPageSimple_swigregister, METH_VARARGS },
-        { (char *)"new_Wizard", (PyCFunction) _wrap_new_Wizard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"new_PreWizard", (PyCFunction) _wrap_new_PreWizard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_Create", (PyCFunction) _wrap_Wizard_Create, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_Init", (PyCFunction) _wrap_Wizard_Init, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_RunWizard", (PyCFunction) _wrap_Wizard_RunWizard, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_GetCurrentPage", (PyCFunction) _wrap_Wizard_GetCurrentPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_SetPageSize", (PyCFunction) _wrap_Wizard_SetPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_GetPageSize", (PyCFunction) _wrap_Wizard_GetPageSize, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_FitToPage", (PyCFunction) _wrap_Wizard_FitToPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_GetPageAreaSizer", (PyCFunction) _wrap_Wizard_GetPageAreaSizer, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_SetBorder", (PyCFunction) _wrap_Wizard_SetBorder, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_IsRunning", (PyCFunction) _wrap_Wizard_IsRunning, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_ShowPage", (PyCFunction) _wrap_Wizard_ShowPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_HasNextPage", (PyCFunction) _wrap_Wizard_HasNextPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_HasPrevPage", (PyCFunction) _wrap_Wizard_HasPrevPage, METH_VARARGS | METH_KEYWORDS },
-        { (char *)"Wizard_swigregister", Wizard_swigregister, METH_VARARGS },
-        { NULL, NULL }
+        { (char *)"new_WizardEvent", (PyCFunction) _wrap_new_WizardEvent, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardEvent_GetDirection", (PyCFunction) _wrap_WizardEvent_GetDirection, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardEvent_GetPage", (PyCFunction) _wrap_WizardEvent_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardEvent_swigregister", WizardEvent_swigregister, METH_VARARGS, NULL },
+        { (char *)"WizardPage_Create", (PyCFunction) _wrap_WizardPage_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPage_GetPrev", (PyCFunction) _wrap_WizardPage_GetPrev, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPage_GetNext", (PyCFunction) _wrap_WizardPage_GetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPage_GetBitmap", (PyCFunction) _wrap_WizardPage_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPage_swigregister", WizardPage_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_PyWizardPage", (PyCFunction) _wrap_new_PyWizardPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PrePyWizardPage", (PyCFunction) _wrap_new_PrePyWizardPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_Create", (PyCFunction) _wrap_PyWizardPage_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage__setCallbackInfo", (PyCFunction) _wrap_PyWizardPage__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoMoveWindow", (PyCFunction) _wrap_PyWizardPage_base_DoMoveWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoSetSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoSetClientSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoSetVirtualSize", (PyCFunction) _wrap_PyWizardPage_base_DoSetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoGetSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoGetClientSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetClientSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoGetPosition", (PyCFunction) _wrap_PyWizardPage_base_DoGetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoGetVirtualSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetVirtualSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_DoGetBestSize", (PyCFunction) _wrap_PyWizardPage_base_DoGetBestSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_InitDialog", (PyCFunction) _wrap_PyWizardPage_base_InitDialog, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_TransferDataToWindow", (PyCFunction) _wrap_PyWizardPage_base_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_TransferDataFromWindow", (PyCFunction) _wrap_PyWizardPage_base_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_Validate", (PyCFunction) _wrap_PyWizardPage_base_Validate, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_AcceptsFocus", (PyCFunction) _wrap_PyWizardPage_base_AcceptsFocus, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_AcceptsFocusFromKeyboard", (PyCFunction) _wrap_PyWizardPage_base_AcceptsFocusFromKeyboard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_GetMaxSize", (PyCFunction) _wrap_PyWizardPage_base_GetMaxSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_AddChild", (PyCFunction) _wrap_PyWizardPage_base_AddChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_base_RemoveChild", (PyCFunction) _wrap_PyWizardPage_base_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"PyWizardPage_swigregister", PyWizardPage_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_WizardPageSimple", (PyCFunction) _wrap_new_WizardPageSimple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreWizardPageSimple", (PyCFunction) _wrap_new_PreWizardPageSimple, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPageSimple_Create", (PyCFunction) _wrap_WizardPageSimple_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPageSimple_SetPrev", (PyCFunction) _wrap_WizardPageSimple_SetPrev, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPageSimple_SetNext", (PyCFunction) _wrap_WizardPageSimple_SetNext, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPageSimple_Chain", (PyCFunction) _wrap_WizardPageSimple_Chain, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"WizardPageSimple_swigregister", WizardPageSimple_swigregister, METH_VARARGS, NULL },
+        { (char *)"new_Wizard", (PyCFunction) _wrap_new_Wizard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"new_PreWizard", (PyCFunction) _wrap_new_PreWizard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_Create", (PyCFunction) _wrap_Wizard_Create, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_Init", (PyCFunction) _wrap_Wizard_Init, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_RunWizard", (PyCFunction) _wrap_Wizard_RunWizard, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_GetCurrentPage", (PyCFunction) _wrap_Wizard_GetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_SetPageSize", (PyCFunction) _wrap_Wizard_SetPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_GetPageSize", (PyCFunction) _wrap_Wizard_GetPageSize, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_FitToPage", (PyCFunction) _wrap_Wizard_FitToPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_GetPageAreaSizer", (PyCFunction) _wrap_Wizard_GetPageAreaSizer, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_SetBorder", (PyCFunction) _wrap_Wizard_SetBorder, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_IsRunning", (PyCFunction) _wrap_Wizard_IsRunning, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_ShowPage", (PyCFunction) _wrap_Wizard_ShowPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_HasNextPage", (PyCFunction) _wrap_Wizard_HasNextPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_HasPrevPage", (PyCFunction) _wrap_Wizard_HasPrevPage, METH_VARARGS | METH_KEYWORDS, NULL },
+        { (char *)"Wizard_swigregister", Wizard_swigregister, METH_VARARGS, NULL },
+        { NULL, NULL, 0, NULL }
 };
 
 
@@ -3465,7 +3544,7 @@ _swigt__p_int,
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
 
 static swig_const_info swig_const_table[] = {
-{0}};
+{0, 0, 0, 0.0, 0, 0}};
 
 #ifdef __cplusplus
 }
@@ -3491,7 +3570,7 @@ SWIGEXPORT(void) SWIG_init(void) {
     }
     SWIG_InstallConstants(d,swig_const_table);
     
-    PyDict_SetItemString(d,"WIZARD_EX_HELPBUTTON", SWIG_FromInt((int)wxWIZARD_EX_HELPBUTTON));
+    PyDict_SetItemString(d,"WIZARD_EX_HELPBUTTON", SWIG_From_int((int)wxWIZARD_EX_HELPBUTTON));
     PyDict_SetItemString(d, "wxEVT_WIZARD_PAGE_CHANGED", PyInt_FromLong(wxEVT_WIZARD_PAGE_CHANGED));
     PyDict_SetItemString(d, "wxEVT_WIZARD_PAGE_CHANGING", PyInt_FromLong(wxEVT_WIZARD_PAGE_CHANGING));
     PyDict_SetItemString(d, "wxEVT_WIZARD_CANCEL", PyInt_FromLong(wxEVT_WIZARD_CANCEL));